diff mbox series

[v2] uki.bbclass: fix UKI_DEVICETREE usage

Message ID 20260330103502.168286-1-mikko.rapeli@linaro.org
State New
Headers show
Series [v2] uki.bbclass: fix UKI_DEVICETREE usage | expand

Commit Message

Mikko Rapeli March 30, 2026, 10:35 a.m. UTC 
Set KERNEL_DEVICETREE to empty string with weakest assignment
if machine does not set this. This changes UKI_DEVICETREE
to an empty string by default and fixes genericarm64 uki image builds:

ERROR: ERROR: cannot find /home/builder/src/core/build/tmp/deploy/images/genericarm64/${KERNEL_DEVICETREE}.

Also remove UKI_DEVICETREE setting in wic and uki oeqa selftests since the
class now handles it correctly.

Tested-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 meta/classes-recipe/uki.bbclass     | 1 +
 meta/lib/oeqa/selftest/cases/uki.py | 3 ---
 meta/lib/oeqa/selftest/cases/wic.py | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

v2: weakly set KERNEL_DEVICETREE to empty as suggested by Richard,
    remove setting of UKI_DEVICETREE in uki and wic selftests as
    suggested by Jon

v1: https://lists.openembedded.org/g/openembedded-core/message/233870
diff mbox series

Patch

diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
index 326697a06660..938f0f80614b 100644
--- a/meta/classes-recipe/uki.bbclass
+++ b/meta/classes-recipe/uki.bbclass
@@ -80,6 +80,7 @@  UKI_CONFIG_FILE ?= "${UNPACKDIR}/uki.conf"
 UKI_FILENAME ?= "uki.efi"
 UKI_KERNEL_FILENAME ?= "${KERNEL_IMAGETYPE}"
 UKI_CMDLINE ?= "rootwait root=LABEL=root"
+KERNEL_DEVICETREE ??= ""
 UKI_DEVICETREE ?= "${KERNEL_DEVICETREE}"
 # secure boot keys and cert, needs sbsign-tools-native (meta-secure-core)
 #UKI_SB_KEY ?= ""
diff --git a/meta/lib/oeqa/selftest/cases/uki.py b/meta/lib/oeqa/selftest/cases/uki.py
index 4265a40e9e11..fc31fb767a64 100644
--- a/meta/lib/oeqa/selftest/cases/uki.py
+++ b/meta/lib/oeqa/selftest/cases/uki.py
@@ -47,9 +47,6 @@  QB_DEFAULT_KERNEL = "none"
 # boot command line provided via uki, not via bootloader
 UKI_CMDLINE = "rootwait root=LABEL=root console=${KERNEL_CONSOLE}"
 
-# qemu provides the devicetree at boot, do not embed a dtb in the uki for selftests
-UKI_DEVICETREE = ""
-
 # disable kvm, breaks boot
 QEMU_USE_KVM = ""
 
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index 644247684576..3b61c3295e0d 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1580,10 +1580,6 @@  QB_DEFAULT_KERNEL = "none"
 
 # boot command line provided via uki, not via bootloader
 UKI_CMDLINE = "rootwait root=LABEL=root console=${KERNEL_CONSOLE}"
-
-# qemu provides the devicetree at boot, do not embed a dtb in the uki for selftests
-UKI_DEVICETREE = ""
-
 """
         self.append_config(config)
         bitbake('core-image-base ovmf')