summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-08-19 12:47:03 +0800
committerJoe MacDonald <joe@deserted.net>2021-08-29 21:34:22 -0400
commit31325005e4409e08b7f68eed44a9c4086453e4dd (patch)
treed8b3ac61ecc2730dab6f395d6dbcaf52f4e58a6c /classes
parenta101ac3dcedf5e8957061576dd6dadd738711717 (diff)
downloadmeta-selinux-31325005e4409e08b7f68eed44a9c4086453e4dd.tar.gz
classes: drop redundant classes
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>
Diffstat (limited to 'classes')
-rw-r--r--classes/enable-selinux.bbclass3
-rw-r--r--classes/meson-enable-selinux.bbclass4
-rw-r--r--classes/meson-selinux.bbclass4
-rw-r--r--classes/with-audit.bbclass5
-rw-r--r--classes/with-selinux.bbclass4
5 files changed, 1 insertions, 19 deletions
diff --git a/classes/enable-selinux.bbclass b/classes/enable-selinux.bbclass
index c8af97e..3dc61d6 100644
--- a/classes/enable-selinux.bbclass
+++ b/classes/enable-selinux.bbclass
@@ -1,4 +1,3 @@
1inherit selinux 1inherit selinux
2 2
3PACKAGECONFIG:append = " ${@target_selinux(d)}" 3PACKAGECONFIG:append = " ${@target_selinux(d, 'selinux')}"
4PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
diff --git a/classes/meson-enable-selinux.bbclass b/classes/meson-enable-selinux.bbclass
deleted file mode 100644
index b5b8cb7..0000000
--- a/classes/meson-enable-selinux.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
1inherit selinux
2
3PACKAGECONFIG:append = " ${@target_selinux(d)}"
4PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
diff --git a/classes/meson-selinux.bbclass b/classes/meson-selinux.bbclass
deleted file mode 100644
index 337ffca..0000000
--- a/classes/meson-selinux.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
1inherit selinux
2
3PACKAGECONFIG:append = " ${@target_selinux(d)}"
4PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,"
diff --git a/classes/with-audit.bbclass b/classes/with-audit.bbclass
deleted file mode 100644
index a99bf71..0000000
--- a/classes/with-audit.bbclass
+++ /dev/null
@@ -1,5 +0,0 @@
1# There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled.
2inherit selinux
3
4PACKAGECONFIG:append = " ${@target_selinux(d, 'audit')}"
5PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
diff --git a/classes/with-selinux.bbclass b/classes/with-selinux.bbclass
deleted file mode 100644
index 37b9e13..0000000
--- a/classes/with-selinux.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
1inherit selinux
2
3PACKAGECONFIG:append = " ${@target_selinux(d)}"
4PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"