summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-02-07 14:49:24 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2018-05-08 10:30:56 -0400
commit58a5d6439765ba06e3e187b1daa7efb5fdbd25be (patch)
tree8cc264162299bcdac2fa0efb85ab6e5888122365
parentc8290189fdaa2d23b0f37fd9c4f6236e64ee58a3 (diff)
downloadmeta-selinux-58a5d6439765ba06e3e187b1daa7efb5fdbd25be.tar.gz
iproute2: remove workaround for selinux
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@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-connectivity/iproute2/iproute2_%.bbappend2
-rw-r--r--recipes-connectivity/iproute2/iproute2_selinux.inc5
2 files changed, 1 insertions, 6 deletions
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 @@
1inherit with-selinux
2
3do_configure_append() {
4 sed -i 's/\(HAVE_SELINUX:=\).*/\1y/' ${B}/Config
5}