From: Randolph Sapp <r...@ti.com>
Upstream's dtb directory structure has no real standard. They just tend
to idle around the 2/3 directory depth. Recursively search for the
dtb/dtbo files instead of assuming anything.
Fixes: 04ab57d200 (kernel-devicetree: allow specification of dtb
directory, 2023-05-02)
Signed-off-by: Randolph Sapp <r...@ti.com>
---
meta/classes-recipe/kernel-devicetree.bbclass | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/meta/classes-recipe/kernel-devicetree.bbclass
b/meta/classes-recipe/kernel-devicetree.bbclass
index 831fdd1527..1beaedfb44 100644
--- a/meta/classes-recipe/kernel-devicetree.bbclass
+++ b/meta/classes-recipe/kernel-devicetree.bbclass
@@ -12,12 +12,22 @@ python () {
d.appendVar("PACKAGES", "
${KERNEL_PACKAGE_NAME}-image-zimage-bundle")
}
-FILES:${KERNEL_PACKAGE_NAME}-devicetree = " \
- /${KERNEL_DTBDEST}/*.dtb \
- /${KERNEL_DTBDEST}/*.dtbo \
- /${KERNEL_DTBDEST}/*/*.dtb \
- /${KERNEL_DTBDEST}/*/*.dtbo \
-"
+# recursivly search for devicetree files
+python () {
+ import glob
+ import os
+
+ file_paths = []
+ dest_dir = d.getVar('D')
+ full_dtb_dir = dest_dir + '/' + d.getVar('KERNEL_DTBDEST')
+
+ for file in glob.glob(full_dtb_dir + '/**/*.dtb*', recursive=True):
+ file_paths.append('/' + os.path.relpath(file, dest_dir))
+
+ d.appendVar("FILES:" + d.getVar("KERNEL_PACKAGE_NAME") + '-devicetree',
+ ' '+' '.join(file_paths))
+}
+
FILES:${KERNEL_PACKAGE_NAME}-image-zimage-bundle =
"/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin"
# Generate kernel+devicetree bundle
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181158):
https://lists.openembedded.org/g/openembedded-core/message/181158
Mute This Topic: https://lists.openembedded.org/mt/98837535/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
