uki.bbclass: fix UKI_DEVICETREE usage

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
index 326697a06660d8be7e4f04f56dec780061645c43..938f0f80614b59a7c3b4a0280a64d1bc2a97df53 100644 (file)
--- 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 4265a40e9e11af02e63ab171bc655604f08c4cb7..fc31fb767a640925142131c4187364a6717aff0f 100644 (file)
--- 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 13c2bd6847800ae6d551b0fbb603e55605e10012..f627f709964116e9ee53b20358571cca39f8a79b 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1650,10 +1650,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')