From b1dac7e2b26f869c991c6492aa7fa18eaa4b47f6 Mon Sep 17 00:00:00 2001 From: Eric Chanudet Date: Sun, 9 Sep 2018 19:25:12 +0000 Subject: policycorutils: package files in base_sbindir. SBINDIR was changed to ${base_sbindir} in commit: 8cc9c17 policycoreutils: fix installed-but-not-shipped on updated recipes FILES_${PN}-* must now capture files installed in ${base_sbindir} accordingly. Signed-off-by: Eric Chanudet Signed-off-by: Joe MacDonald --- recipes-security/selinux/policycoreutils.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc index 98000de..85ff164 100644 --- a/recipes-security/selinux/policycoreutils.inc +++ b/recipes-security/selinux/policycoreutils.inc @@ -79,26 +79,25 @@ PACKAGES =+ "\ ${PN}-setsebool \ " FILES_${PN}-fixfiles += "${base_sbindir}/fixfiles" -FILES_${PN}-genhomedircon += "${sbindir}/genhomedircon" +FILES_${PN}-genhomedircon += "${base_sbindir}/genhomedircon" FILES_${PN}-loadpolicy += "\ ${base_sbindir}/load_policy \ - ${sbindir}/load_policy \ " FILES_${PN}-newrole += "\ ${bindir}/newrole \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \ " FILES_${PN}-runinit += "\ - ${sbindir}/run_init \ - ${sbindir}/open_init_pty \ + ${base_sbindir}/run_init \ + ${base_sbindir}/open_init_pty \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \ " FILES_${PN}-dbg += "${prefix}/libexec/selinux/hll/.debug" FILES_${PN}-secon += "${bindir}/secon" -FILES_${PN}-semodule += "${sbindir}/semodule" +FILES_${PN}-semodule += "${base_sbindir}/semodule" FILES_${PN}-hll += "${prefix}/libexec/selinux/hll/*" FILES_${PN}-sestatus += "\ - ${sbindir}/sestatus \ + ${base_sbindir}/sestatus \ ${sysconfdir}/sestatus.conf \ " FILES_${PN}-setfiles += "\ @@ -106,7 +105,7 @@ FILES_${PN}-setfiles += "\ ${base_sbindir}/setfiles \ " FILES_${PN}-setsebool += "\ - ${sbindir}/setsebool \ + ${base_sbindir}/setsebool \ ${datadir}/bash-completion/completions/setsebool \ " -- cgit v1.2.3-54-g00ecf