summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2021-08-21 08:18:28 -0700
committerArmin Kuster <akuster808@gmail.com>2021-08-26 21:37:34 -0700
commitb6d5cac306fcad491d0ec759808a027bad835f69 (patch)
tree421208df2c18b783bd5283bc631a52fbf500a75d
parent57470052b05a003a634f3cc5101a27441556b53e (diff)
downloadmeta-security-b6d5cac306fcad491d0ec759808a027bad835f69.tar.gz
kas: fix DISTRO appends
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--kas/kas-security-base.yml5
-rw-r--r--kas/kas-security-dm.yml1
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 @@
1header: 1header:
2 version: 8 2 version: 9
3 3
4distro: poky 4distro: poky
5 5
@@ -57,7 +57,7 @@ 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 = " security pam apparmor smack ima tpm tpm2"
61 MACHINE_FEATURES:append = " tpm tpm2" 61 MACHINE_FEATURES:append = " tpm tpm2"
62 62
63 diskmon: | 63 diskmon: |
@@ -73,7 +73,6 @@ local_conf_header:
73 73
74bblayers_conf_header: 74bblayers_conf_header:
75 base: | 75 base: |
76 POKY_BBLAYERS_CONF_VERSION = "7"
77 BBPATH = "${TOPDIR}" 76 BBPATH = "${TOPDIR}"
78 BBFILES ?= "" 77 BBFILES ?= ""
79 78
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:
5 5
6local_conf_header: 6local_conf_header:
7 dm-verify: | 7 dm-verify: |
8 DISTRO_FEATURES:append = " integrity"
8 DM_VERITY_IMAGE = "core-image-minimal" 9 DM_VERITY_IMAGE = "core-image-minimal"
9 DM_VERITY_IMAGE_TYPE = "ext4" 10 DM_VERITY_IMAGE_TYPE = "ext4"
10 IMAGE_CLASSES += "dm-verity-img" 11 IMAGE_CLASSES += "dm-verity-img"