uboot-sign: fix counters in do_uboot_assemble_fitimage

Without unsetting `j` and `k` for each `UBOOT_MACHINE`, `j` and `k`
are incremented in the same frequency as `i` and therefore `$j -eq $i`
and `$k -eq $i` is always true for the first `type` from `UBOOT_CONFIG`
and the first `binary` from `UBOOT_BINARIES`.

(From OE-Core rev: 7f81c38e91563d6d77621a3bfcb155cd226c9b74)

Signed-off-by: Paul Gerber <paul.gerber@ew.tq-group.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3aef55c7ceb654b0012f20618bfd6ead1ef578b6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass
index c8e097f2f2..3e5f5dcf66 100644
--- a/meta/classes-recipe/uboot-sign.bbclass
+++ b/meta/classes-recipe/uboot-sign.bbclass
@@ -356,8 +356,9 @@ do_uboot_assemble_fitimage() {
         fi
 
         if [ -n "${UBOOT_CONFIG}" ]; then
-                unset i j k
+                unset i
                 for config in ${UBOOT_MACHINE}; do
+                        unset j k
                         i=$(expr $i + 1);
                         for type in ${UBOOT_CONFIG}; do
                                 j=$(expr $j + 1);