diff options
author | Eric Chanudet <chanudete@ainfosec.com> | 2018-09-09 19:25:12 +0000 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2018-09-09 16:02:00 -0400 |
commit | b1dac7e2b26f869c991c6492aa7fa18eaa4b47f6 (patch) | |
tree | 66832646f7028f0679fc749c9e4e8546c044073d | |
parent | 8cc9c17d402e63095c33aedb7d852bc466acb302 (diff) | |
download | meta-selinux-b1dac7e2b26f869c991c6492aa7fa18eaa4b47f6.tar.gz |
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 <chanudete@ainfosec.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-security/selinux/policycoreutils.inc | 13 |
1 files 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 =+ "\ | |||
79 | ${PN}-setsebool \ | 79 | ${PN}-setsebool \ |
80 | " | 80 | " |
81 | FILES_${PN}-fixfiles += "${base_sbindir}/fixfiles" | 81 | FILES_${PN}-fixfiles += "${base_sbindir}/fixfiles" |
82 | FILES_${PN}-genhomedircon += "${sbindir}/genhomedircon" | 82 | FILES_${PN}-genhomedircon += "${base_sbindir}/genhomedircon" |
83 | FILES_${PN}-loadpolicy += "\ | 83 | FILES_${PN}-loadpolicy += "\ |
84 | ${base_sbindir}/load_policy \ | 84 | ${base_sbindir}/load_policy \ |
85 | ${sbindir}/load_policy \ | ||
86 | " | 85 | " |
87 | FILES_${PN}-newrole += "\ | 86 | FILES_${PN}-newrole += "\ |
88 | ${bindir}/newrole \ | 87 | ${bindir}/newrole \ |
89 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \ | 88 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \ |
90 | " | 89 | " |
91 | FILES_${PN}-runinit += "\ | 90 | FILES_${PN}-runinit += "\ |
92 | ${sbindir}/run_init \ | 91 | ${base_sbindir}/run_init \ |
93 | ${sbindir}/open_init_pty \ | 92 | ${base_sbindir}/open_init_pty \ |
94 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \ | 93 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \ |
95 | " | 94 | " |
96 | FILES_${PN}-dbg += "${prefix}/libexec/selinux/hll/.debug" | 95 | FILES_${PN}-dbg += "${prefix}/libexec/selinux/hll/.debug" |
97 | FILES_${PN}-secon += "${bindir}/secon" | 96 | FILES_${PN}-secon += "${bindir}/secon" |
98 | FILES_${PN}-semodule += "${sbindir}/semodule" | 97 | FILES_${PN}-semodule += "${base_sbindir}/semodule" |
99 | FILES_${PN}-hll += "${prefix}/libexec/selinux/hll/*" | 98 | FILES_${PN}-hll += "${prefix}/libexec/selinux/hll/*" |
100 | FILES_${PN}-sestatus += "\ | 99 | FILES_${PN}-sestatus += "\ |
101 | ${sbindir}/sestatus \ | 100 | ${base_sbindir}/sestatus \ |
102 | ${sysconfdir}/sestatus.conf \ | 101 | ${sysconfdir}/sestatus.conf \ |
103 | " | 102 | " |
104 | FILES_${PN}-setfiles += "\ | 103 | FILES_${PN}-setfiles += "\ |
@@ -106,7 +105,7 @@ FILES_${PN}-setfiles += "\ | |||
106 | ${base_sbindir}/setfiles \ | 105 | ${base_sbindir}/setfiles \ |
107 | " | 106 | " |
108 | FILES_${PN}-setsebool += "\ | 107 | FILES_${PN}-setsebool += "\ |
109 | ${sbindir}/setsebool \ | 108 | ${base_sbindir}/setsebool \ |
110 | ${datadir}/bash-completion/completions/setsebool \ | 109 | ${datadir}/bash-completion/completions/setsebool \ |
111 | " | 110 | " |
112 | 111 | ||