[RFC] kernel-devicetree: fix KERNEL_DEVICETREE_BUNDLE

Message ID 20220131100702.3726634-1-vdidelot@pbsc.com
State New
Headers show
Series [RFC] kernel-devicetree: fix KERNEL_DEVICETREE_BUNDLE | expand

Commit Message

Vivien Didelot Jan. 31, 2022, 10:07 a.m. UTC
When KERNEL_DEVICETREE_BUNDLE is set to "1", do_deploy tries to cat
zImage from ${KERNEL_IMAGEDEST}, but only zImage-${KERNEL_VERSION}
is present in this directory.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
---
 meta/classes/kernel-devicetree.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index b4338da1b1..2fad475f05 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -91,7 +91,7 @@  do_deploy:append() {
 		fi
 		for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
 			if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
-				cat ${D}/${KERNEL_IMAGEDEST}/$type \
+				cat ${D}/${KERNEL_IMAGEDEST}/$type-${KERNEL_VERSION} \
 					$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
 					> $deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
 				if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then