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

Signed-off-by: David Bagonyi <david.bagonyi@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass
index 3dc029c429302dfa891ee8451a4008a049cdd015..3065c5457710fcaea3180b3249197f59f4d5821a 100644 (file)
--- 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 ""