From: Florian Amstutz <florian.amstutz@scs.ch>
Date: Tue, 2 Jul 2024 08:16:35 +0000 (-0700)
Subject: u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a0764eaac90bd62dac4a387eed5eb68f556412f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations

If i or j have not been unset in do_deploy:prepend functions, images are not correctly
copied to DEPLOYDIR.

Signed-off-by: Florian Amstutz <florian.amstutz@scs.ch>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index ce14847b332..fc36c21ec2e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -217,6 +217,7 @@ RDEPENDS:${PN} += "${PN}-env"
 do_deploy () {
     if [ -n "${UBOOT_CONFIG}" ]
     then
+        unset i j
         for config in ${UBOOT_MACHINE}; do
             i=$(expr $i + 1);
             for type in ${UBOOT_CONFIG}; do