From b206ba59db30297075bbe78e925c8e08b088d7f5 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 29 Jul 2021 16:34:22 -0700 Subject: kas: Convert to new override syntax Signed-off-by: Armin Kuster --- kas/kas-security-alt.yml | 2 +- kas/kas-security-base.yml | 4 ++-- kas/kas-security-parsec.yml | 2 +- kas/qemumips64-multi.yml | 4 ++-- kas/qemux86-comp.yml | 4 ++-- 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: local_conf_header: alt: | - DISTRO_FEATURES_append = " systemd" + 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: EXTRA_IMAGE_FEATURES ?= "debug-tweaks" PACKAGE_CLASSES = "package_ipk" - DISTRO_FEATURES_append = " pam apparmor smack ima" - MACHINE_FEATURES_append = " tpm tpm2" + DISTRO_FEATURES:append = " pam apparmor smack ima" + MACHINE_FEATURES:append = " tpm tpm2" diskmon: | 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: local_conf_header: meta-parsec: | - IMAGE_INSTALL_append = " parsec-service parsec-tool" + 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: require conf/multilib.conf MULTILIBS = "multilib:lib64 multilib:lib32" DEFAULTTUNE = "mips64-n32" - DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" - DEFAULTTUNE_virtclass-multilib-lib32 = "mips32r2" + DEFAULTTUNE:virtclass-multilib-lib64 = "mips64" + DEFAULTTUNE:virtclass-multilib-lib32 = "mips32r2" machine: 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: local_conf_header: meta-compliance: | - IMAGE_INSTALL_append = " lynis" - IMAGE_INSTALL_append = " openscap openscap-daemon scap-security-guide" + IMAGE_INSTALL:append = " lynis" + IMAGE_INSTALL:append = " openscap openscap-daemon scap-security-guide" machine: qemux86 -- cgit v1.2.3-54-g00ecf