Skip to contentSkip to conversation

kernel-devicetree: fix KERNEL_DEVICETREE_BUNDLE

RFC New Vivien Didelot 1 participant 1 message Jan 31, 2022

lore
Share & tools
lore
#0 lore raw

RFC 1/1 kernel-devicetree: fix KERNEL_DEVICETREE_BUNDLE

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.

---
 meta/classes/kernel-devicetree.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel-devicetree.bbclass +1 -1
index b4338da1b1..2fad475f05 100644
@@ -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
Signature · 1 line
2.35.0