aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-03-21 17:11:31 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-03-21 17:11:31 +0100
commita496e40faf21a5963731de1719fd2f8a3b839ede (patch)
tree9fd2bdd0c956ae8c83c76d07dd01eacd0339ee8a
parent44eb76cfdc726cbcfceef704ccce1a88c875fa81 (diff)
Only compress vmdk in AGLCI and extend inclusion of drivers
To save space and download bandwith, we use the compressed format in CI. Also adapt the inclusion of the guest drivers to the compressed image. Bug-AGL: SPEC-2771 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I140fb31954be5ec2b46596a9816087d3fb670416
-rw-r--r--meta-agl-bsp/conf/include/agl_qemux86-64.inc2
-rw-r--r--meta-agl-profile-core/conf/include/agl-devel.inc3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index dcfa89a66..aaab86f5c 100644
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -21,7 +21,7 @@ QB_KERNEL_CMDLINE_APPEND_append = " quiet"
DISTRO_FEATURES_append = " sota"
# Image support
-AGL_EXTRA_IMAGE_FSTYPES = "wic.vmdk.xz"
+AGL_EXTRA_IMAGE_FSTYPES = "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'wic.vmdk.xz', 'wic.vmdk', d)}"
IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom"
# Root device
diff --git a/meta-agl-profile-core/conf/include/agl-devel.inc b/meta-agl-profile-core/conf/include/agl-devel.inc
index 2157f6f1a..914ab393e 100644
--- a/meta-agl-profile-core/conf/include/agl-devel.inc
+++ b/meta-agl-profile-core/conf/include/agl-devel.inc
@@ -4,7 +4,8 @@ IMAGE_INSTALL_append = " \
packagegroup-agl-core-devel \
"
-IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'wic.vmdk', ' open-vm-tools vboxguestdrivers', '', d)}"
+IMAGE_INSTALL_append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
+
# Install libdrm-test, including modetest, to images with GUI
IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"