diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2017-11-23 21:56:51 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2019-04-08 13:49:57 +0200 |
| commit | 9610b229cf6c2ff80cd7d342f5248a1bcedc2238 (patch) | |
| tree | 8d3372c98801750549c335a5d81abd81eca33809 | |
| parent | 651e5d049c2ac7db6824bf8c5705703a47305508 (diff) | |
| download | openembedded-core-contrib-9610b229cf6c2ff80cd7d342f5248a1bcedc2238.tar.gz | |
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>
| -rw-r--r-- | meta/classes/kernel-devicetree.bbclass | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index de12f26138..457ad994bc 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 } |