From 27a7fbb767c0a25b34a03cae90320908f8ade8de Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Wed, 19 Nov 2025 23:06:33 -0300 Subject: [PATCH] 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 Signed-off-by: Mathieu Dubois-Briand --- meta/classes-recipe/uki.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- 2.47.3