[yocto] [meta-selinux][PATCH] libselinux: fix usrmerge do_install
mingli.yu at windriver.com
mingli.yu at windriver.com
Tue Aug 28 23:05:06 PDT 2018
From: Mingli Yu <Mingli.Yu at windriver.com>
When usrmerge enabled in DISTRO_FEATURES,
the binary actually installed under ${base_sbindir},
so cannot remove ${D}${base_sbindir} when
usrmerge enabled.
Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
---
recipes-security/selinux/libselinux.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-security/selinux/libselinux.inc b/recipes-security/selinux/libselinux.inc
index 51d0875..ae47b5a 100644
--- a/recipes-security/selinux/libselinux.inc
+++ b/recipes-security/selinux/libselinux.inc
@@ -34,7 +34,9 @@ do_compile_append() {
do_install_append() {
oe_runmake install-pywrap swigify \
PYSITEDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages
- rm -rf ${D}${base_sbindir}
+ if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+ rm -rf ${D}${base_sbindir}
+ fi
}
BBCLASSEXTEND = "native"
--
2.7.4
More information about the yocto
mailing list