From b6d5cac306fcad491d0ec759808a027bad835f69 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 21 Aug 2021 08:18:28 -0700 Subject: kas: fix DISTRO appends Signed-off-by: Armin Kuster --- kas/kas-security-base.yml | 5 ++--- kas/kas-security-dm.yml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kas/kas-security-base.yml b/kas/kas-security-base.yml index e5fe16b..730da6f 100644 --- a/kas/kas-security-base.yml +++ b/kas/kas-security-base.yml @@ -1,5 +1,5 @@ header: - version: 8 + version: 9 distro: poky @@ -57,7 +57,7 @@ local_conf_header: EXTRA_IMAGE_FEATURES ?= "debug-tweaks" PACKAGE_CLASSES = "package_ipk" - DISTRO_FEATURES:append = " pam apparmor smack ima" + DISTRO_FEATURES:append = " security pam apparmor smack ima tpm tpm2" MACHINE_FEATURES:append = " tpm tpm2" diskmon: | @@ -73,7 +73,6 @@ local_conf_header: bblayers_conf_header: base: | - POKY_BBLAYERS_CONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" diff --git a/kas/kas-security-dm.yml b/kas/kas-security-dm.yml index 7ce0e9d..c03b336 100644 --- a/kas/kas-security-dm.yml +++ b/kas/kas-security-dm.yml @@ -5,6 +5,7 @@ header: local_conf_header: dm-verify: | + DISTRO_FEATURES:append = " integrity" DM_VERITY_IMAGE = "core-image-minimal" DM_VERITY_IMAGE_TYPE = "ext4" IMAGE_CLASSES += "dm-verity-img" -- cgit v1.2.3-54-g00ecf