From: Ricardo Salveti <ricardo@foundries.io>
Date: Thu, 20 Nov 2025 02:06:33 +0000 (-0300)
Subject: uki.bbclass: use basename for dtbs available via KERNEL_DEVICETREE
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27a7fbb767c0a25b34a03cae90320908f8ade8de;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

uki.bbclass: use basename for dtbs available via KERNEL_DEVICETREE

Device-tree files set via KERNEL_DEVICETREE are deployed without any
vendor sub-directory (e.g. arm/juno.dtb gets deployed as juno.dtb).

Same is also done in kernel-fit-image.bbclass.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---

diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
index fedff222c6c..a2b1c8a82d6 100644
--- a/meta/classes-recipe/uki.bbclass
+++ b/meta/classes-recipe/uki.bbclass
@@ -152,7 +152,9 @@ python do_uki() {
     # dtb
     if d.getVar('KERNEL_DEVICETREE'):
         for dtb in d.getVar('KERNEL_DEVICETREE').split():
-            dtb_path = "%s/%s" % (deploy_dir_image, dtb)
+            # DTBs are without sub-directories in deploy_dir
+            dtb_name = os.path.basename(dtb)
+            dtb_path = "%s/%s" % (deploy_dir_image, dtb_name)
             if not os.path.exists(dtb_path):
                 bb.fatal(f"ERROR: cannot find {dtb_path}.")
             ukify_cmd += " --devicetree %s" % (dtb_path)