diff options
author | Randolph Sapp <rs@ti.com> | 2023-05-26 18:36:16 -0500 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-06-01 16:24:08 -1000 |
commit | 1e6f147c686a91b9a5996f529e32ee1852f946b7 (patch) | |
tree | fd82515a6c790420cccf08b032a25cb0350b97e9 | |
parent | ae34dbb41051987292f6db75978fb7d567ab52dd (diff) | |
download | poky-1e6f147c686a91b9a5996f529e32ee1852f946b7.tar.gz |
kernel-devicetree: recursively search for dtbs
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)
(From OE-Core rev: 717b9f18a51e9c9fd5a471238aa2ea4de439ef17)
Signed-off-by: Randolph Sapp <rs@ti.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/classes/kernel-devicetree.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index e1e67cbc56..18ab6b4c4f 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass | |||
@@ -6,12 +6,12 @@ python () { | |||
6 | d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-image-zimage-bundle") | 6 | d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-image-zimage-bundle") |
7 | } | 7 | } |
8 | 8 | ||
9 | # recursivly search for devicetree files | ||
9 | FILES:${KERNEL_PACKAGE_NAME}-devicetree = " \ | 10 | FILES:${KERNEL_PACKAGE_NAME}-devicetree = " \ |
10 | /${KERNEL_DTBDEST}/*.dtb \ | 11 | /${KERNEL_DTBDEST}/**/*.dtb \ |
11 | /${KERNEL_DTBDEST}/*.dtbo \ | 12 | /${KERNEL_DTBDEST}/**/*.dtbo \ |
12 | /${KERNEL_DTBDEST}/*/*.dtb \ | ||
13 | /${KERNEL_DTBDEST}/*/*.dtbo \ | ||
14 | " | 13 | " |
14 | |||
15 | FILES:${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin" | 15 | FILES:${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin" |
16 | 16 | ||
17 | # Generate kernel+devicetree bundle | 17 | # Generate kernel+devicetree bundle |