From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 9 Jun 2022 08:58:35 +0000 (+0100)
Subject: uboot-sign: Fix potential index error issues
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3891
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d219c97bdf5d30be89795fbf9b66ddc367bef384;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 4ca8118eb27..31ffe1f4720 100644
--- 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