summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2021-07-29 16:34:22 -0700
committerArmin Kuster <akuster808@gmail.com>2021-08-01 08:47:08 -0700
commitb206ba59db30297075bbe78e925c8e08b088d7f5 (patch)
treeda20c940489f69b666b29dd78ac75a7f5fae97c5
parent01399d19d0693f71a51b1167aa3c708c9a39477a (diff)
downloadmeta-security-b206ba59db30297075bbe78e925c8e08b088d7f5.tar.gz
kas: Convert to new override syntax
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--kas/kas-security-alt.yml2
-rw-r--r--kas/kas-security-base.yml4
-rw-r--r--kas/kas-security-parsec.yml2
-rw-r--r--kas/qemumips64-multi.yml4
-rw-r--r--kas/qemux86-comp.yml4
5 files changed, 8 insertions, 8 deletions
diff --git a/kas/kas-security-alt.yml b/kas/kas-security-alt.yml
index 25384df..f073216 100644
--- a/kas/kas-security-alt.yml
+++ b/kas/kas-security-alt.yml
@@ -10,4 +10,4 @@ repos:
10 10
11local_conf_header: 11local_conf_header:
12 alt: | 12 alt: |
13 DISTRO_FEATURES_append = " systemd" 13 DISTRO_FEATURES:append = " systemd"
diff --git a/kas/kas-security-base.yml b/kas/kas-security-base.yml
index c4be5e2..b9ce493 100644
--- a/kas/kas-security-base.yml
+++ b/kas/kas-security-base.yml
@@ -57,8 +57,8 @@ local_conf_header:
57 EXTRA_IMAGE_FEATURES ?= "debug-tweaks" 57 EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
58 PACKAGE_CLASSES = "package_ipk" 58 PACKAGE_CLASSES = "package_ipk"
59 59
60 DISTRO_FEATURES_append = " pam apparmor smack ima" 60 DISTRO_FEATURES:append = " pam apparmor smack ima"
61 MACHINE_FEATURES_append = " tpm tpm2" 61 MACHINE_FEATURES:append = " tpm tpm2"
62 62
63 diskmon: | 63 diskmon: |
64 BB_DISKMON_DIRS = "\ 64 BB_DISKMON_DIRS = "\
diff --git a/kas/kas-security-parsec.yml b/kas/kas-security-parsec.yml
index 6152f0c..22ef5dd 100644
--- a/kas/kas-security-parsec.yml
+++ b/kas/kas-security-parsec.yml
@@ -18,4 +18,4 @@ repos:
18 18
19local_conf_header: 19local_conf_header:
20 meta-parsec: | 20 meta-parsec: |
21 IMAGE_INSTALL_append = " parsec-service parsec-tool" 21 IMAGE_INSTALL:append = " parsec-service parsec-tool"
diff --git a/kas/qemumips64-multi.yml b/kas/qemumips64-multi.yml
index c8cf94b..6ef8b39 100644
--- a/kas/qemumips64-multi.yml
+++ b/kas/qemumips64-multi.yml
@@ -8,7 +8,7 @@ local_conf_header:
8 require conf/multilib.conf 8 require conf/multilib.conf
9 MULTILIBS = "multilib:lib64 multilib:lib32" 9 MULTILIBS = "multilib:lib64 multilib:lib32"
10 DEFAULTTUNE = "mips64-n32" 10 DEFAULTTUNE = "mips64-n32"
11 DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" 11 DEFAULTTUNE:virtclass-multilib-lib64 = "mips64"
12 DEFAULTTUNE_virtclass-multilib-lib32 = "mips32r2" 12 DEFAULTTUNE:virtclass-multilib-lib32 = "mips32r2"
13 13
14machine: qemumips64 14machine: qemumips64
diff --git a/kas/qemux86-comp.yml b/kas/qemux86-comp.yml
index 14c5dca..478d631 100644
--- a/kas/qemux86-comp.yml
+++ b/kas/qemux86-comp.yml
@@ -5,7 +5,7 @@ header:
5 5
6local_conf_header: 6local_conf_header:
7 meta-compliance: | 7 meta-compliance: |
8 IMAGE_INSTALL_append = " lynis" 8 IMAGE_INSTALL:append = " lynis"
9 IMAGE_INSTALL_append = " openscap openscap-daemon scap-security-guide" 9 IMAGE_INSTALL:append = " openscap openscap-daemon scap-security-guide"
10 10
11machine: qemux86 11machine: qemux86