summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-08-04 14:49:44 +0800
committerJoe MacDonald <joe@deserted.net>2021-08-04 16:18:39 -0400
commit654201e25da6761f2b69f5ff1dd80ec61a79027f (patch)
tree7b10cd94c337572319c5cc265d6a2eb5020586b5 /classes
parentd5b93baf576c535bb27406dc10d81076bda3dee1 (diff)
downloadmeta-selinux-654201e25da6761f2b69f5ff1dd80ec61a79027f.tar.gz
meta-selinux: convert to new override syntax
This is the result of automated script conversion: poky/scripts/contrib/convert-overrides.py meta-selinux Converting the metadata to use ":" as the override character instead of "_". 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-audit.bbclass2
-rw-r--r--classes/enable-selinux.bbclass2
-rw-r--r--classes/meson-enable-selinux.bbclass2
-rw-r--r--classes/meson-selinux.bbclass2
-rw-r--r--classes/selinux-image.bbclass2
-rw-r--r--classes/with-audit.bbclass2
-rw-r--r--classes/with-selinux.bbclass2
7 files changed, 7 insertions, 7 deletions
diff --git a/classes/enable-audit.bbclass b/classes/enable-audit.bbclass
index 4538b0b..17bcc8e 100644
--- a/classes/enable-audit.bbclass
+++ b/classes/enable-audit.bbclass
@@ -1,4 +1,4 @@
1# There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled. 1# There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled.
2inherit selinux 2inherit selinux
3 3
4PACKAGECONFIG_append = " ${@target_selinux(d, 'audit')}" 4PACKAGECONFIG:append = " ${@target_selinux(d, 'audit')}"
diff --git a/classes/enable-selinux.bbclass b/classes/enable-selinux.bbclass
index de2a124..c8af97e 100644
--- a/classes/enable-selinux.bbclass
+++ b/classes/enable-selinux.bbclass
@@ -1,4 +1,4 @@
1inherit selinux 1inherit selinux
2 2
3PACKAGECONFIG_append = " ${@target_selinux(d)}" 3PACKAGECONFIG:append = " ${@target_selinux(d)}"
4PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," 4PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
diff --git a/classes/meson-enable-selinux.bbclass b/classes/meson-enable-selinux.bbclass
index 91c2a2b..b5b8cb7 100644
--- a/classes/meson-enable-selinux.bbclass
+++ b/classes/meson-enable-selinux.bbclass
@@ -1,4 +1,4 @@
1inherit selinux 1inherit selinux
2 2
3PACKAGECONFIG_append = " ${@target_selinux(d)}" 3PACKAGECONFIG:append = " ${@target_selinux(d)}"
4PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux," 4PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
diff --git a/classes/meson-selinux.bbclass b/classes/meson-selinux.bbclass
index 77a763a..337ffca 100644
--- a/classes/meson-selinux.bbclass
+++ b/classes/meson-selinux.bbclass
@@ -1,4 +1,4 @@
1inherit selinux 1inherit selinux
2 2
3PACKAGECONFIG_append = " ${@target_selinux(d)}" 3PACKAGECONFIG:append = " ${@target_selinux(d)}"
4PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux," 4PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,"
diff --git a/classes/selinux-image.bbclass b/classes/selinux-image.bbclass
index 7f157d3..23645b7 100644
--- a/classes/selinux-image.bbclass
+++ b/classes/selinux-image.bbclass
@@ -10,6 +10,6 @@ selinux_set_labels () {
10 10
11DEPENDS += "policycoreutils-native" 11DEPENDS += "policycoreutils-native"
12 12
13IMAGE_PREPROCESS_COMMAND_append = " selinux_set_labels ;" 13IMAGE_PREPROCESS_COMMAND:append = " selinux_set_labels ;"
14 14
15inherit core-image 15inherit core-image
diff --git a/classes/with-audit.bbclass b/classes/with-audit.bbclass
index 0c15312..a99bf71 100644
--- a/classes/with-audit.bbclass
+++ b/classes/with-audit.bbclass
@@ -1,5 +1,5 @@
1# There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled. 1# There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled.
2inherit selinux 2inherit selinux
3 3
4PACKAGECONFIG_append = " ${@target_selinux(d, 'audit')}" 4PACKAGECONFIG:append = " ${@target_selinux(d, 'audit')}"
5PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," 5PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
diff --git a/classes/with-selinux.bbclass b/classes/with-selinux.bbclass
index 7873d9b..37b9e13 100644
--- a/classes/with-selinux.bbclass
+++ b/classes/with-selinux.bbclass
@@ -1,4 +1,4 @@
1inherit selinux 1inherit selinux
2 2
3PACKAGECONFIG_append = " ${@target_selinux(d)}" 3PACKAGECONFIG:append = " ${@target_selinux(d)}"
4PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," 4PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"