diff mbox series

[whinlatter,09/67] uki.bbclass: use basename for dtbs available via KERNEL_DEVICETREE

Message ID 20251213095931.2571498-9-ankur.tyagi85@gmail.com
State New
Headers show
Series [whinlatter,01/67] bluez5: upgrade 5.84 -> 5.85 | expand

Commit Message

Ankur Tyagi Dec. 13, 2025, 9:58 a.m. UTC 
From: Ricardo Salveti <ricardo@foundries.io>

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>
(cherry picked from commit 27a7fbb767c0a25b34a03cae90320908f8ade8de)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta/classes-recipe/uki.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass
index fedff222c6..a2b1c8a82d 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)