From: Andreas Oberritter <obi@opendreambox.org>
Date: Thu, 23 Nov 2017 20:56:51 +0000 (+0100)
Subject: kernel-devicetree.bbclass: search dtb in all subdirectories of arch/${ARCH}/boot
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9610b229cf6c2ff80cd7d342f5248a1bcedc2238;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

kernel-devicetree.bbclass: search dtb in all subdirectories of arch/${ARCH}/boot

Fixes installation of dtbs grouped in vendor subdirectories in cases
where the subdirectory is not part of the entries in KERNEL_DEVICETREE.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---

diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index de12f261389..457ad994bcf 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -18,15 +18,6 @@ normalize_dtb () {
 	echo "$dtb"
 }
 
-get_real_dtb_path_in_kernel () {
-	dtb="$1"
-	dtb_path="${B}/arch/${ARCH}/boot/dts/$dtb"
-	if [ ! -e "$dtb_path" ]; then
-		dtb_path="${B}/arch/${ARCH}/boot/$dtb"
-	fi
-	echo "$dtb_path"
-}
-
 do_configure_append() {
 	if [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
 		if echo ${KERNEL_IMAGETYPE_FOR_MAKE} | grep -q 'zImage'; then
@@ -61,7 +52,7 @@ do_install_append() {
 		dtb=`normalize_dtb "$dtbf"`
 		dtb_ext=${dtb##*.}
 		dtb_base_name=`basename $dtb .$dtb_ext`
-		dtb_path=`get_real_dtb_path_in_kernel "$dtb"`
+		dtb_path=`find ${B}/arch/${ARCH}/boot -path "*/$dtb" -print -quit`
 		install -m 0644 $dtb_path ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext
 	done
 }