From a27d352a4a65387a5fa10ccf8d3580296040c7d8 Mon Sep 17 00:00:00 2001
From: Mingli Yu <Mingli.Yu@windriver.com>
Date: Wed, 29 Aug 2018 14:05:06 +0800
Subject: libselinux: fix usrmerge do_install

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@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.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"
-- 
cgit v1.2.3-54-g00ecf