[PATCH] uki.bbclass: fix UKI_DEVICETREE

[PATCH] uki.bbclass: fix UKI_DEVICETREE

[Mikko Rapeli]

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(-)

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 ?= ""
-- 
2.34.1

Re: [OE-core] [PATCH] uki.bbclass: fix UKI_DEVICETREE

[Richard Purdie]

On Wed, 2026-03-25 at 12:48 +0200, Mikko Rapeli via lists.openembedded.org wrote:
> 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(-)
> 
> 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 ?= ""

Is there a reason not to do:

KERNEL_DEVICETREE ??= ""

instead?

Inline python isn't great...

Cheers,

Richard

Re: [OE-core] [PATCH] uki.bbclass: fix UKI_DEVICETREE

[Jon Mason]

We are seeing the issue addressed with this patch in our CI
(qemuarm64-secureboot with uefi-secureboot), and this patch fixes it.

Also, I tried RP's suggested "??=", and that seems to work as well.
Though, if that approach is used, it might be good to remove the
changes to meta/lib/oeqa/selftest/cases/uki.py in the original commit
(56aeb7ff4e239dddfd853cc4db73e8ad34cc56ac), as they shouldn't be
needed.

Feel free to add:
    Tested-by: Jon Mason <jon.mason@arm.com>

Thanks,
Jon

On Wed, Mar 25, 2026 at 6:49 AM Mikko Rapeli via
lists.openembedded.org
<mikko.rapeli=linaro.org@lists.openembedded.org> wrote:
>
> 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(-)
>
> 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 ?= ""
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#233870): https://lists.openembedded.org/g/openembedded-core/message/233870
> Mute This Topic: https://lists.openembedded.org/mt/118498767/3616920
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [jdmason@kudzu.us]
> -=-=-=-=-=-=-=-=-=-=-=-
>