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
DISTRO_FEATURES_append = " sota"
# Image support
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
IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom"
# Root device
packagegroup-agl-core-devel \
"
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)}"
# Install libdrm-test, including modetest, to images with GUI
IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"