From: Peter Hoyes <Peter.Hoyes@arm.com>
Date: Tue, 19 Oct 2021 13:47:27 +0000 (+0100)
Subject: u-boot: Fix syntax error in ${UBOOT_ENV}.scr compilation
X-Git-Tag: uninative-3.5~1106
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e33994157abbea897ceaf465f9d2a99a9c8212b1;p=openembedded-core.git

u-boot: Fix syntax error in ${UBOOT_ENV}.scr compilation

A previous commit (a3d3c2d4ac421a0dde2a20825eab4434f16b2452) introduced
support for compiling a U-Boot boot script, but the logic contained a
syntax error which was only visible in the build log. Fix the error by
using separate []s for each expression in the if statement.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
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 ec4a3d201d..2d5e46f4ef 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -108,7 +108,7 @@ do_compile () {
         fi
     fi
 
-    if [ -n "${UBOOT_ENV}" && "${UBOOT_ENV_SUFFIX}" = "scr" ]
+    if [ -n "${UBOOT_ENV}" ] && [ "${UBOOT_ENV_SUFFIX}" = "scr" ]
     then
         ${UBOOT_MKIMAGE} -C none -A ${UBOOT_ARCH} -T script -d ${WORKDIR}/${UBOOT_ENV_SRC} ${WORKDIR}/${UBOOT_ENV_BINARY}
     fi