[yocto] [meta-selinux][PATCH 1/2] iproute2: remove workaround for selinux

kai.kang at windriver.com kai.kang at windriver.com
Tue Feb 6 22:49:24 PST 2018


From: Kai Kang <kai.kang at windriver.com>

After upgrade to 4.14.1, iproute2 changes it way to create configure output
file config.mk which is also renamed from 'Config'. With RSS, the workaround
for iproute2 is not needed any more.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 recipes-connectivity/iproute2/iproute2_%.bbappend  | 2 +-
 recipes-connectivity/iproute2/iproute2_selinux.inc | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 recipes-connectivity/iproute2/iproute2_selinux.inc

diff --git a/recipes-connectivity/iproute2/iproute2_%.bbappend b/recipes-connectivity/iproute2/iproute2_%.bbappend
index 7719d3b..b01ad25 100644
--- a/recipes-connectivity/iproute2/iproute2_%.bbappend
+++ b/recipes-connectivity/iproute2/iproute2_%.bbappend
@@ -1 +1 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)}
diff --git a/recipes-connectivity/iproute2/iproute2_selinux.inc b/recipes-connectivity/iproute2/iproute2_selinux.inc
deleted file mode 100644
index b0a7ffe..0000000
--- a/recipes-connectivity/iproute2/iproute2_selinux.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-inherit with-selinux
-
-do_configure_append() {
-	sed -i 's/\(HAVE_SELINUX:=\).*/\1y/' ${B}/Config
-}
-- 
2.11.0




More information about the yocto mailing list