summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2020-09-21 13:57:01 -0700
committerArmin Kuster <akuster808@gmail.com>2020-09-29 07:17:55 -0700
commit46a7fa856ce792a04afb39e06213a5b95dfa8ed1 (patch)
tree2ec452681635a6318cb82660e8d7e7cf23e1c8fe
parentd6baccc068451e3649ae7583a32d26b268086e11 (diff)
downloadmeta-security-46a7fa856ce792a04afb39e06213a5b95dfa8ed1.tar.gz
kas: build with ptest. remove apparmor
apparmor does not build with ptest enabled. skipping it for now Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--kas/kas-security-base.yml3
-rw-r--r--kas/qemux86-test.yml2
2 files changed, 2 insertions, 3 deletions
diff --git a/kas/kas-security-base.yml b/kas/kas-security-base.yml
index cd87d1d..6a77af5 100644
--- a/kas/kas-security-base.yml
+++ b/kas/kas-security-base.yml
@@ -42,8 +42,7 @@ local_conf_header:
42 INHERIT += "testimage" 42 INHERIT += "testimage"
43 TEST_QEMUBOOT_TIMEOUT = "1500" 43 TEST_QEMUBOOT_TIMEOUT = "1500"
44 EXTRA_IMAGE_FEATURES ?= "debug-tweaks" 44 EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
45 DISTRO_FEATURES_remove = " ptest" 45 PACKAGE_CLASSES = "package_ipk"
46 PACKAGE_CLASSES = "package_rpm"
47 46
48 47
49 diskmon: | 48 diskmon: |
diff --git a/kas/qemux86-test.yml b/kas/qemux86-test.yml
index 823a8b2..52bf40e 100644
--- a/kas/qemux86-test.yml
+++ b/kas/qemux86-test.yml
@@ -6,6 +6,6 @@ header:
6 6
7local_conf_header: 7local_conf_header:
8 meta-security: | 8 meta-security: |
9 DISTRO_FEATURES_append = " ptest apparmor pam" 9 DISTRO_FEATURES_append = " pam"
10 10
11machine: qemux86 11machine: qemux86