From 21f823ac9c4b49b468976cd811c9bfab30c55a4b Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 28 Aug 2018 15:37:53 +0800 Subject: policycoreutils: fix usrmerge install path Set SBINDIR to ${base_sbindir} to fix below issue when usrmerge enabled in DISTRO_FEATURES | ERROR: QA Issue: policycoreutils-dbg package is not obeying usrmerge distro feature. /sbin should be relocated to /usr. [usrmerge] | WARNING: policycoreutils-2.7-r0 do_package: QA Issue: policycoreutils: Files/directories were installed but not shipped in any package: /sbin/restorecon /sbin/setfiles /sbin/load_policy /sbin/restorecon_xattr /sbin/fixfiles Signed-off-by: Mingli Yu Signed-off-by: Joe MacDonald --- recipes-security/selinux/policycoreutils.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc index b7cb510..e2d44f4 100644 --- a/recipes-security/selinux/policycoreutils.inc +++ b/recipes-security/selinux/policycoreutils.inc @@ -158,6 +158,7 @@ do_compile_prepend() { do_install_prepend() { export PYTHON=python export SEMODULE_PATH=${sbindir} SYSTEMDDIR=${D}/${systemd_unitdir} + export SBINDIR="${D}/${base_sbindir}" } do_install_class-native() { -- cgit v1.2.3-54-g00ecf