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".

(From OE-Core rev: 6f668f85d7e5b0a9d36198db865cf1e1a012b2e1)

Signed-off-by: David Bagonyi <david.bagonyi@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass
index 3dc029c429..3065c54577 100644
--- a/meta/classes-recipe/uboot-sign.bbclass
+++ b/meta/classes-recipe/uboot-sign.bbclass
@@ -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 ""