summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-08-17 17:34:39 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2018-08-17 08:39:15 -0400
commit7d9c68ee6b39a85539983e222574e6ca3c693f36 (patch)
treef8c301603eb0d4622dfdcb73daaf8986ff1a7dfc
parentf10e98292917fb452a6f7d438897f46eb992421d (diff)
downloadmeta-selinux-7d9c68ee6b39a85539983e222574e6ca3c693f36.tar.gz
mcstrans: define SBINDIR to ${D}/${base_sbindir}
Add SBINDIR=${D}/${base_sbindir} to EXTRA_OEMAKE to fix below error when usrmerge enabled in DISTRO_FEATURES. ERROR: QA Issue: mcstrans-dbg package is not obeying usrmerge distro feature. /sbin should be relocated to /usr. [usrmerge] Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/selinux/mcstrans.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-security/selinux/mcstrans.inc b/recipes-security/selinux/mcstrans.inc
index 590e6d2..996e8d0 100644
--- a/recipes-security/selinux/mcstrans.inc
+++ b/recipes-security/selinux/mcstrans.inc
@@ -14,7 +14,7 @@ inherit systemd update-rc.d
14 14
15DEPENDS += "libsepol libselinux libcap" 15DEPENDS += "libsepol libselinux libcap"
16 16
17EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}" 17EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir} SBINDIR=${D}/${base_sbindir}"
18do_install_append() { 18do_install_append() {
19 install -d ${D}${sbindir} 19 install -d ${D}${sbindir}
20 install -m 755 utils/untranscon ${D}${sbindir}/ 20 install -m 755 utils/untranscon ${D}${sbindir}/