summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2017-11-23 21:56:51 +0100
committerAndreas Oberritter <obi@opendreambox.org>2018-12-20 22:32:11 +0100
commit203fdf19f830545017f11e1b8c5e1936aae0de41 (patch)
treec901803fc089835eccb2f0cf3b7717b116f98051
parenta12bd55c78c34d12ab6153ac60e33a785bb77e9c (diff)
downloadopenembedded-core-contrib-obi/sumo.tar.gz
openembedded-core-contrib-obi/sumo.tar.bz2
openembedded-core-contrib-obi/sumo.zip
kernel-devicetree.bbclass: search dtb in all subdirectories of arch/${ARCH}/bootobi/sumo
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>
-rw-r--r--meta/classes/kernel-devicetree.bbclass11
1 files changed, 1 insertions, 10 deletions
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index 9c5e125981..80bea4d887 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
}