summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-08-28 15:37:53 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2018-09-07 16:12:51 -0400
commit21f823ac9c4b49b468976cd811c9bfab30c55a4b (patch)
tree6dabb63c3385ba085b913be9b42f88f266045207
parent7d9c68ee6b39a85539983e222574e6ca3c693f36 (diff)
downloadmeta-selinux-21f823ac9c4b49b468976cd811c9bfab30c55a4b.tar.gz
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 <Mingli.Yu@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/selinux/policycoreutils.inc1
1 files changed, 1 insertions, 0 deletions
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() {
158do_install_prepend() { 158do_install_prepend() {
159 export PYTHON=python 159 export PYTHON=python
160 export SEMODULE_PATH=${sbindir} SYSTEMDDIR=${D}/${systemd_unitdir} 160 export SEMODULE_PATH=${sbindir} SYSTEMDDIR=${D}/${systemd_unitdir}
161 export SBINDIR="${D}/${base_sbindir}"
161} 162}
162 163
163do_install_class-native() { 164do_install_class-native() {