From 7d9c68ee6b39a85539983e222574e6ca3c693f36 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 17 Aug 2018 17:34:39 +0800 Subject: 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 Signed-off-by: Joe MacDonald --- recipes-security/selinux/mcstrans.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 DEPENDS += "libsepol libselinux libcap" -EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}" +EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir} SBINDIR=${D}/${base_sbindir}" do_install_append() { install -d ${D}${sbindir} install -m 755 utils/untranscon ${D}${sbindir}/ -- cgit v1.2.3-54-g00ecf