Skip to contentSkip to conversation

iproute2: remove workaround for selinux

PATCH In review [email protected] 1 participant 3 messages Feb 7, 2018 – Feb 22, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iproute2: remove workaround for selinux

From: Kai Kang <[email protected]>

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.

---
 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
recipes-connectivity/iproute2/iproute2_%.bbappend +1 -1
index 7719d3b..b01ad25 100644
@@ -1 +1 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)}
recipes-connectivity/iproute2/iproute2_selinux.inc deleted +0 -5
deleted file mode 100644
index b0a7ffe..0000000
@@ -1,5 +0,0 @@
-inherit with-selinux
-
-do_configure_append() {
-	sed -i 's/\(HAVE_SELINUX:=\).*/\1y/' ${B}/Config
-}
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 libselinux-python: remove rdepends python-importlib

From: Kai Kang <[email protected]>

Package python-importlib has been removed and the functionality is now part of python-core. So remove python-importlib from runtime dependency of libselinux-python.

---
 recipes-security/selinux/libselinux.inc | 1 -
 1 file changed, 1 deletion(-)
recipes-security/selinux/libselinux.inc +0 -1
index bd5ce8d..aaa3f3b 100644
@@ -8,7 +8,6 @@ LICENSE = "PD"
 inherit lib_package pythonnative
 
 DEPENDS += "libsepol python libpcre swig-native"
-RDEPENDS_${PN}-python += "python-importlib"
 
 PACKAGES += "${PN}-python"
 FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
Signature · 1 line
2.11.0
author
#2 lore raw
In reply to [email protected]
Quoted 5 lines · On 2018年02月07日 14:49, [email protected] wrote:

From: Kai Kang <[email protected]>

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.

Ping.

--Kai

Quoted 26 lines
---
  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

recipes-connectivity/iproute2/iproute2_%.bbappend +1 -1
index 7719d3b..b01ad25 100644
@@ -1 +1 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)}
recipes-connectivity/iproute2/iproute2_selinux.inc deleted +0 -5
deleted file mode 100644
index b0a7ffe..0000000
@@ -1,5 +0,0 @@
-inherit with-selinux
-
-do_configure_append() {
-	sed -i 's/\(HAVE_SELINUX:=\).*/\1y/' ${B}/Config
-}
Signature · 2 lines
Regards,
Neil | Kai Kang