CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

classes: drop redundant classes

Browse Source 
There are some redundant classes: enable-selinux.bbclass,
with-selinux.bbclass, meson-enable-selinux.bbclass,
meson-selinux.bbclass, enable-audit.bbclass, with-audit.bbclass.
These classes only add PACKAGEOCNFIG[selinux]/[audit] to recipes. But
currently most recipes have added PACKAGECONFIG[selinux]/[audit] in
their bb files. We don't need these anymore. Only keep
enable-selinux.class and enable-audit.class to append
PACKAGECONFIG[selinux]/[audit] for recipes.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
This commit is contained in:
Yi Zhao 2021-08-19 12:47:03 +08:00 committed by Joe MacDonald
parent a101ac3dce
commit 31325005e4
30 changed files with 40 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/enable-selinux.bbclass
View File

@ -1,4 +1,3 @@
inherit selinux inherit selinux
PACKAGECONFIG:append = " ${@target_selinux(d)}" PACKAGECONFIG:append = " ${@target_selinux(d, 'selinux')}"
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"

4
classes/meson-enable-selinux.bbclass
View File

@ -1,4 +0,0 @@
inherit selinux
PACKAGECONFIG:append = " ${@target_selinux(d)}"
PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"

4
classes/meson-selinux.bbclass
View File

@ -1,4 +0,0 @@
inherit selinux
PACKAGECONFIG:append = " ${@target_selinux(d)}"
PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,"

5
classes/with-audit.bbclass
View File

@ -1,5 +0,0 @@
# There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled.
inherit selinux
PACKAGECONFIG:append = " ${@target_selinux(d, 'audit')}"
PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"

4
classes/with-selinux.bbclass
View File

@ -1,4 +0,0 @@
inherit selinux
PACKAGECONFIG:append = " ${@target_selinux(d)}"
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"

3
recipes-connectivity/iproute2/iproute2_%.bbappend
View File

@ -1 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
PACKAGECONFIG[selinux] = ",,libselinux"

9
recipes-connectivity/openssh/openssh_selinux.inc
View File

@ -1,9 +1,6 @@
inherit with-selinux inherit enable-selinux enable-audit
FILESEXTRAPATHS:prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
# There is no distro feature just for audit. PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
PACKAGECONFIG:append = " audit" PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit"
PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit,"

4
recipes-core/coreutils/coreutils_%.bbappend
View File

@ -1,2 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"

2
recipes-core/dbus/dbus_%.bbappend
View File

@ -1,2 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux enable-audit', '', d)}

1
recipes-core/eudev/eudev_selinux.inc
View File

@ -1,3 +1,4 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
inherit enable-selinux inherit enable-selinux
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"

2
recipes-core/glib-2.0/glib-2.0_%.bbappend
View File

@ -1 +1 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-enable-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}

2
recipes-core/systemd/systemd_selinux.inc
View File

@ -1,4 +1,4 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-audit', '', d)} inherit enable-selinux enable-audit
do_install:append() { do_install:append() {
if ${@bb.utils.contains('PACKAGECONFIG', 'backlight', 'true', 'false', d)}; then if ${@bb.utils.contains('PACKAGECONFIG', 'backlight', 'true', 'false', d)}; then

3
recipes-core/util-linux/util-linux_%.bbappend
View File

@ -1 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"

4
recipes-devtools/rpm/rpm_selinux.inc
View File

@ -1,2 +1,2 @@
inherit with-selinux inherit enable-selinux
PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage," PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"

2
recipes-extended/at/at_%.bbappend
View File

@ -1 +1 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}

4
recipes-extended/cronie/cronie_%.bbappend
View File

@ -1,2 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-audit', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux enable-audit', '', d)}
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"

3
recipes-extended/findutils/findutils_%.bbappend
View File

@ -1 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"

1
recipes-extended/pam/libpam_selinux.inc
View File

@ -1,3 +1,4 @@
inherit enable-selinux inherit enable-selinux
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
RDEPENDS:${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}" RDEPENDS:${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}"

1
recipes-extended/psmisc/psmisc_%.bbappend
View File

@ -1 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"

2
recipes-extended/sed/sed_4.%.bbappend
View File

@ -1 +1 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}

5
recipes-extended/shadow/shadow_selinux.inc
View File

@ -1,6 +1,3 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
inherit with-selinux with-audit inherit enable-selinux enable-audit
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage,"

5
recipes-extended/sudo/sudo_%.bbappend
View File

@ -1 +1,4 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux enable-audit', '', d)}
PACKAGECONFIG[audit] = "--with-linux-audit,--without-linux-audit,audit"
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"

4
recipes-extended/tar/tar_selinux.inc
View File

@ -1,3 +1,3 @@
inherit with-selinux inherit enable-selinux
PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'acl', ' acl', '', d)}" PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"

4
recipes-graphics/mesa/mesa_%.bbappend
View File

@ -1,2 +1,2 @@
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-selinux', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux"

6
recipes-graphics/xcb/libxcb_selinux.inc
View File

@ -1,6 +0,0 @@
inherit enable-selinux
# libxcb-xselinux will not build with libselinux, so remove the depend
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,,"
PACKAGES += "${PN}-xselinux"
FILES:${PN}-xselinux += "${libdir}/libxcb-xselinux.so.*"

0
recipes-graphics/xcb/libxcb_%.bbappend → recipes-graphics/xorg-lib/libxcb_%.bbappend
View File

5
recipes-graphics/xorg-lib/libxcb_selinux.inc Normal file
View File

@ -0,0 +1,5 @@
inherit enable-selinux
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
PACKAGES += "${PN}-xselinux"
FILES:${PN}-xselinux += "${libdir}/libxcb-xselinux.so.*"

2
recipes-kernel/perf/perf_selinux.inc
View File

@ -1 +1 @@
DEPENDS .= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', ' audit', '', d)}" inherit enable-audit

2
recipes-support/attr/attr_selinux.inc
View File

@ -1,5 +1,3 @@
inherit selinux
FILESEXTRAPATHS:prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "file://fix-ptest-failures-when-selinux-enabled.patch" SRC_URI += "file://fix-ptest-failures-when-selinux-enabled.patch"

3
recipes-support/gnupg/gnupg_selinux.inc
View File

@ -1,3 +1,2 @@
inherit enable-selinux inherit enable-selinux
# gnupg will not build with libselinux, so remove the depend PACKAGECONFIG[selinux] = "--enable-selinux-support,--disable-selinux-support,libselinux"
PACKAGECONFIG[selinux] = "--enable-selinux-support,--disable-selinux-support,,"