summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2023-06-28 14:13:39 -0400
committerArmin Kuster <akuster808@gmail.com>2023-07-31 06:18:52 -0400
commitcfe73355683894ad30cc43a51973f55c2fcbf1c6 (patch)
treefdcac01172594f8f8a7a29753a56b2d3a62b853c
parent4306007fee73a2841e248c642b912757146c3899 (diff)
downloadmeta-security-cfe73355683894ad30cc43a51973f55c2fcbf1c6.tar.gz
qemu: move qemu setting to image and out of layer.conf
I suspect its better form to have these in the image definition. Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--conf/layer.conf2
-rw-r--r--recipes-core/images/security-build-image.bb5
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 334a945..05f678a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -26,6 +26,4 @@ BBFILES_DYNAMIC += " \
26# Setting SKIP_META_SECURITY_SANITY_CHECK to "1" would skip the bbappend files check. 26# Setting SKIP_META_SECURITY_SANITY_CHECK to "1" would skip the bbappend files check.
27INHERIT += "sanity-meta-security" 27INHERIT += "sanity-meta-security"
28 28
29QB_KERNEL_CMDLINE_APPEND = " ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', 'apparmor=1 security=apparmor', '', d)}"
30
31addpylib ${LAYERDIR}/lib oeqa 29addpylib ${LAYERDIR}/lib oeqa
diff --git a/recipes-core/images/security-build-image.bb b/recipes-core/images/security-build-image.bb
index 411cd20..9c82049 100644
--- a/recipes-core/images/security-build-image.bb
+++ b/recipes-core/images/security-build-image.bb
@@ -18,3 +18,8 @@ inherit core-image
18export IMAGE_BASENAME = "security-build-image" 18export IMAGE_BASENAME = "security-build-image"
19 19
20IMAGE_ROOTFS_EXTRA_SPACE = "5242880" 20IMAGE_ROOTFS_EXTRA_SPACE = "5242880"
21
22QB_KERNEL_CMDLINE_APPEND = " ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', 'apparmor=1 security=apparmor', '', d)}"
23
24# We need more mem to run many apps in this layer
25QB_MEM = "-m 2048"