Skip to contentSkip to conversation

libselinux: fix usrmerge do_install

PATCH New [email protected] 1 participant 1 message Aug 29, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselinux: fix usrmerge do_install

From: Mingli Yu <[email protected]>

When usrmerge enabled in DISTRO_FEATURES, the binary actually installed under ${base_sbindir}, so cannot remove ${D}${base_sbindir} when usrmerge enabled.

---
 recipes-security/selinux/libselinux.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
recipes-security/selinux/libselinux.inc +3 -1
index 51d0875..ae47b5a 100644
@@ -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"
Signature · 1 line
2.7.4