summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-08-29 14:05:06 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2018-09-07 16:12:57 -0400
commita27d352a4a65387a5fa10ccf8d3580296040c7d8 (patch)
tree5520b2015609fc80849e047e6492f296b74a4ac5
parent21f823ac9c4b49b468976cd811c9bfab30c55a4b (diff)
downloadmeta-selinux-a27d352a4a65387a5fa10ccf8d3580296040c7d8.tar.gz
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>
-rw-r--r--recipes-security/selinux/libselinux.inc4
1 files changed, 3 insertions, 1 deletions
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() {
34do_install_append() { 34do_install_append() {
35 oe_runmake install-pywrap swigify \ 35 oe_runmake install-pywrap swigify \
36 PYSITEDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages 36 PYSITEDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages
37 rm -rf ${D}${base_sbindir} 37 if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
38 rm -rf ${D}${base_sbindir}
39 fi
38} 40}
39 41
40BBCLASSEXTEND = "native" 42BBCLASSEXTEND = "native"