uboot-sign: Fix potential index error issues

Someone reported that if some other shell function has left i or j set,
the concat_dtb_helper function could fail. Add a small tweak to avoid this.

[YOCTO #14815]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d219c97bdf5d30be89795fbf9b66ddc367bef384)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 4ca8118eb2726ea897c20ffaf0611e00116cc912..31ffe1f47205424684fd11fe37703fcd0de1d741 100644 (file)
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -134,6 +134,8 @@ concat_dtb_helper() {
 
                        if [ -n "${UBOOT_CONFIG}" ]
                        then
+                               i=0
+                               j=0
                                for config in ${UBOOT_MACHINE}; do
                                        i=$(expr $i + 1);
                                        for type in ${UBOOT_CONFIG}; do