Skip to contentSkip to conversation

u-boot: Fix u-boot signing when building with multiple u-boot configs

PATCH New David Bagonyi 1 participant 1 message Nov 17, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 u-boot: Fix u-boot signing when building with multiple u-boot configs

The prepended code with the i and j variables clash with similar code in uboot.inc, so they need to be unset once we are done using them.

This commit fixes the issue that was introduced in d6858c9 "u-boot: Rework signing to remove interdependencies".

---
 meta/classes-recipe/uboot-sign.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/classes-recipe/uboot-sign.bbclass +3 -1
index 3dc029c429..3065c54577 100644
@@ -149,7 +149,7 @@ deploy_dtb() {
 	fi
 
 	if [ -f "${UBOOT_NODTB_BINARY}" ]; then
-		install -Dm644 ${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${uboot_nodtb_binary}
+		install -Dm644 ${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${uboot_nodtb_binary}
 		if [ -n "${type}" ]; then
 			ln -sf ${uboot_nodtb_binary} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
 		fi
@@ -407,7 +407,9 @@ do_deploy:prepend() {
 					deploy_helper ${type}
 				fi
 			done
+			unset j
 		done
+		unset i
 	else
 		cd ${B}
 		deploy_helper ""
Signature · 1 line
2.17.1