From 414496b7cb0cc118c1113f17521cdce0dd706de8 Mon Sep 17 00:00:00 2001
From: Patrick Vogelaar <patrick.vogelaar@belden.com>
Date: Mon, 11 Dec 2023 08:19:17 +0100
Subject: [PATCH] fix(qemu-coreos-arm64): rework UKI and SWU generation

Aadditional checks are added that make it unnecessary to use overrides for QEMU
---
 .../conf/machine/qemu-coreos-arm64.conf                   | 3 ---
 layers/meta-belden-coreos/classes/coreos-image.bbclass    | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/layers/meta-belden-coreos-bsp/conf/machine/qemu-coreos-arm64.conf b/layers/meta-belden-coreos-bsp/conf/machine/qemu-coreos-arm64.conf
index a8ee292..3507392 100644
--- a/layers/meta-belden-coreos-bsp/conf/machine/qemu-coreos-arm64.conf
+++ b/layers/meta-belden-coreos-bsp/conf/machine/qemu-coreos-arm64.conf
@@ -10,9 +10,6 @@ IMAGE_FSTYPES += "wic.xz wic.bmap"
 WKS_FILE = "qemu-efi-coreos-generic.wks.in"
 QB_DRIVE_TYPE = "/dev/sd"
 
-COREOS_IMAGE_GENERATE_UKI = "1"
-COREOS_IMAGE_GENERATE_SWU = "1"
-
 EFIBOOTGUARD_TIMEOUT ?= "0"
 require conf/machine/include/coreos-generic-features/efi.inc
 require conf/machine/include/coreos-generic-features/partitions.inc
diff --git a/layers/meta-belden-coreos/classes/coreos-image.bbclass b/layers/meta-belden-coreos/classes/coreos-image.bbclass
index e024c0d..85f7f36 100644
--- a/layers/meta-belden-coreos/classes/coreos-image.bbclass
+++ b/layers/meta-belden-coreos/classes/coreos-image.bbclass
@@ -90,13 +90,9 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sys
 # ==============================================================================
 
 # 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_SWU ?= "${@bb.utils.contains("DISTRO_FEATURES", "swupdate", "1", "0", d)}"
-
-COREOS_IMAGE_GENERATE_INSTALLER:qemuall = "0"
-COREOS_IMAGE_GENERATE_UKI:qemuall = "0"
-COREOS_IMAGE_GENERATE_SWU:qemuall = "0"
+COREOS_IMAGE_GENERATE_SWU ?= "${@"1" if "efi" in d.getVar('COMBINED_FEATURES') and "swupdate" in d.getVar("DISTRO_FEATURES") else "0"}"
 
 # Generate the installer image if needed
 do_build[depends] += "${@'coreos-image-installer:do_build' if d.getVar('COREOS_IMAGE_GENERATE_INSTALLER') == '1' else ''}"