LM
/
coreos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(qemu-coreos-arm64): rework UKI and SWU generation 

Aadditional checks are added that make it unnecessary to use overrides for QEMU
This commit is contained in:
Patrick Vogelaar 2023-12-11 08:19:17 +01:00
parent c1eafd4289
commit 414496b7cb
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layers/meta-belden-coreos-bsp/conf/machine/qemu-coreos-arm64.conf
View File

@ -10,9 +10,6 @@ IMAGE_FSTYPES += "wic.xz wic.bmap"
WKS_FILE = "qemu-efi-coreos-generic.wks.in" WKS_FILE = "qemu-efi-coreos-generic.wks.in"
QB_DRIVE_TYPE = "/dev/sd" QB_DRIVE_TYPE = "/dev/sd"
COREOS_IMAGE_GENERATE_UKI = "1"
COREOS_IMAGE_GENERATE_SWU = "1"
EFIBOOTGUARD_TIMEOUT ?= "0" EFIBOOTGUARD_TIMEOUT ?= "0"
require conf/machine/include/coreos-generic-features/efi.inc require conf/machine/include/coreos-generic-features/efi.inc
require conf/machine/include/coreos-generic-features/partitions.inc require conf/machine/include/coreos-generic-features/partitions.inc

8
layers/meta-belden-coreos/classes/coreos-image.bbclass
View File

@ -90,13 +90,9 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sys
# ============================================================================== # ==============================================================================
# Support for Unified Kernel Image and Swupdate are optional # Support for Unified Kernel Image and Swupdate are optional
COREOS_IMAGE_GENERATE_INSTALLER ?= "${@bb.utils.contains("DISTRO_FEATURES", "swupdate", "1", "0", d)}" COREOS_IMAGE_GENERATE_INSTALLER ?= "${@"1" if "efi" in d.getVar('COMBINED_FEATURES') and "swupdate" in d.getVar("DISTRO_FEATURES") else "0"}"
COREOS_IMAGE_GENERATE_UKI ?= "${@bb.utils.contains("COMBINED_FEATURES", "efi", "1", "0", d)}" COREOS_IMAGE_GENERATE_UKI ?= "${@bb.utils.contains("COMBINED_FEATURES", "efi", "1", "0", d)}"
COREOS_IMAGE_GENERATE_SWU ?= "${@bb.utils.contains("DISTRO_FEATURES", "swupdate", "1", "0", d)}" COREOS_IMAGE_GENERATE_SWU ?= "${@"1" if "efi" in d.getVar('COMBINED_FEATURES') and "swupdate" in d.getVar("DISTRO_FEATURES") else "0"}"
COREOS_IMAGE_GENERATE_INSTALLER:qemuall = "0"
COREOS_IMAGE_GENERATE_UKI:qemuall = "0"
COREOS_IMAGE_GENERATE_SWU:qemuall = "0"
# Generate the installer image if needed # Generate the installer image if needed
do_build[depends] += "${@'coreos-image-installer:do_build' if d.getVar('COREOS_IMAGE_GENERATE_INSTALLER') == '1' else ''}" do_build[depends] += "${@'coreos-image-installer:do_build' if d.getVar('COREOS_IMAGE_GENERATE_INSTALLER') == '1' else ''}"