[oe-commits] [openembedded-core] 05/07: kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ea7836b3054f2ba6b9ff23c1ac62b17676fc2b9e
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Fri Jan 31 16:24:42 2020 +0000

    kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE
    
    When using EXTERNAL_KERNEL_DEVICETREE, collect DTB overlays too (*.dtbo)
    as well as iterating down into sub-directories so using the behaviour
    for naming which matches KERNEL_DEVICETREE.
    
    Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel-fitimage.bbclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index ec18a3d..d1b8cdc 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -391,11 +391,10 @@ fitimage_assemble() {
 
 	if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
 		dtbcount=1
-		for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do
-			DTB=`basename ${DTBFILE}`
+		for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do
 			DTB=$(echo "${DTB}" | tr '/' '_')
 			DTBS="${DTBS} ${DTB}"
-			fitimage_emit_section_dtb ${1} ${DTB} ${DTBFILE}
+			fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}"
 		done
 	fi
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.