| Message ID | 20260325104830.23519-1-mikko.rapeli@linaro.org |
|---|---|
| State | Under Review |
| Headers | show |
| Series | uki.bbclass: fix UKI_DEVICETREE | expand |
diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass index 326697a06660..a6a88240f798 100644 --- a/meta/classes-recipe/uki.bbclass +++ b/meta/classes-recipe/uki.bbclass @@ -80,7 +80,7 @@ UKI_CONFIG_FILE ?= "${UNPACKDIR}/uki.conf" UKI_FILENAME ?= "uki.efi" UKI_KERNEL_FILENAME ?= "${KERNEL_IMAGETYPE}" UKI_CMDLINE ?= "rootwait root=LABEL=root" -UKI_DEVICETREE ?= "${KERNEL_DEVICETREE}" +UKI_DEVICETREE ?= "${@ d.getVar('KERNEL_DEVICETREE') or ''}" # secure boot keys and cert, needs sbsign-tools-native (meta-secure-core) #UKI_SB_KEY ?= "" #UKI_SB_CERT ?= ""
UKI_DEVICETREE needs to be empty when KERNEL_DEVICETREE is not set. Fixes genericarm64 uki image builds: ERROR: ERROR: cannot find /home/builder/src/core/build/tmp/deploy/images/genericarm64/${KERNEL_DEVICETREE}. Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> --- meta/classes-recipe/uki.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)