diff options
Diffstat (limited to 'recipes-security/selinux/policycoreutils.inc')
-rw-r--r-- | recipes-security/selinux/policycoreutils.inc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc index 85ff164..92f7a75 100644 --- a/recipes-security/selinux/policycoreutils.inc +++ b/recipes-security/selinux/policycoreutils.inc | |||
@@ -19,7 +19,7 @@ DEPENDS += "libsepol libselinux libsemanage libcap gettext-native" | |||
19 | EXTRA_DEPENDS = "libcap-ng libcgroup" | 19 | EXTRA_DEPENDS = "libcap-ng libcgroup" |
20 | DEPENDS += "${@['', '${EXTRA_DEPENDS}']['${PN}' != '${BPN}-native']}" | 20 | DEPENDS += "${@['', '${EXTRA_DEPENDS}']['${PN}' != '${BPN}-native']}" |
21 | 21 | ||
22 | inherit selinux pythonnative | 22 | inherit selinux python3native |
23 | 23 | ||
24 | RDEPENDS_${BPN}-fixfiles += "\ | 24 | RDEPENDS_${BPN}-fixfiles += "\ |
25 | ${BPN}-setfiles \ | 25 | ${BPN}-setfiles \ |
@@ -27,7 +27,6 @@ RDEPENDS_${BPN}-fixfiles += "\ | |||
27 | findutils \ | 27 | findutils \ |
28 | " | 28 | " |
29 | RDEPENDS_${BPN}-genhomedircon += "\ | 29 | RDEPENDS_${BPN}-genhomedircon += "\ |
30 | ${BPN}-genhomedircon \ | ||
31 | ${BPN}-semodule \ | 30 | ${BPN}-semodule \ |
32 | " | 31 | " |
33 | RDEPENDS_${BPN}-loadpolicy += "\ | 32 | RDEPENDS_${BPN}-loadpolicy += "\ |
@@ -45,10 +44,6 @@ RDEPENDS_${BPN}-semodule += "\ | |||
45 | libselinux \ | 44 | libselinux \ |
46 | libsemanage \ | 45 | libsemanage \ |
47 | " | 46 | " |
48 | # static link to libsepol | ||
49 | RDEPENDS_${BPN}-semodule-expand += "libsepol libselinux" | ||
50 | RDEPENDS_${BPN}-semodule-link += "libsepol libselinux" | ||
51 | RDEPENDS_${BPN}-semodule-package += "libsepol libselinux" | ||
52 | RDEPENDS_${BPN}-sestatus += "libselinux" | 47 | RDEPENDS_${BPN}-sestatus += "libselinux" |
53 | RDEPENDS_${BPN}-setfiles += "\ | 48 | RDEPENDS_${BPN}-setfiles += "\ |
54 | libselinux \ | 49 | libselinux \ |
@@ -61,10 +56,6 @@ RDEPENDS_${BPN}-setsebool += "\ | |||
61 | " | 56 | " |
62 | RDEPENDS_${BPN} += "selinux-python" | 57 | RDEPENDS_${BPN} += "selinux-python" |
63 | 58 | ||
64 | WARN_QA_remove = " unsafe-references-in-scripts" | ||
65 | ERROR_QA_remove = " unsafe-references-in-scripts" | ||
66 | |||
67 | |||
68 | PACKAGES =+ "\ | 59 | PACKAGES =+ "\ |
69 | ${PN}-fixfiles \ | 60 | ${PN}-fixfiles \ |
70 | ${PN}-genhomedircon \ | 61 | ${PN}-genhomedircon \ |
@@ -102,6 +93,7 @@ FILES_${PN}-sestatus += "\ | |||
102 | " | 93 | " |
103 | FILES_${PN}-setfiles += "\ | 94 | FILES_${PN}-setfiles += "\ |
104 | ${base_sbindir}/restorecon \ | 95 | ${base_sbindir}/restorecon \ |
96 | ${base_sbindir}/restorecon_xattr \ | ||
105 | ${base_sbindir}/setfiles \ | 97 | ${base_sbindir}/setfiles \ |
106 | " | 98 | " |
107 | FILES_${PN}-setsebool += "\ | 99 | FILES_${PN}-setsebool += "\ |
@@ -147,7 +139,7 @@ sysroot_stage_dirs_append_class-native() { | |||
147 | } | 139 | } |
148 | 140 | ||
149 | do_compile_prepend() { | 141 | do_compile_prepend() { |
150 | export PYTHON=python | 142 | export PYTHON=python3 |
151 | export PYLIBVER='python${PYTHON_BASEVERSION}' | 143 | export PYLIBVER='python${PYTHON_BASEVERSION}' |
152 | export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" | 144 | export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" |
153 | export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so" | 145 | export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so" |
@@ -155,7 +147,7 @@ do_compile_prepend() { | |||
155 | } | 147 | } |
156 | 148 | ||
157 | do_install_prepend() { | 149 | do_install_prepend() { |
158 | export PYTHON=python | 150 | export PYTHON=python3 |
159 | export SBINDIR="${D}/${base_sbindir}" | 151 | export SBINDIR="${D}/${base_sbindir}" |
160 | } | 152 | } |
161 | 153 | ||