[oe-commits] [openembedded-core] 02/27: kernel: fitimage: Repair misuse of shell test command

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 9b20fd24f607885e94096a5e09e8370d6ac143fa
Author: Marek Vasut <marex at denx.de>
AuthorDate: Sun May 8 13:21:53 2016 +0200

    kernel: fitimage: Repair misuse of shell test command
    
    The kernel fitImage must be amended with signature if and only if
    UBOOT_SIGN_ENABLE = 1 . In the current case, the UBOOT_SIGN_ENABLE
    could be either 0 (default) or 1 , which test -n always correctly
    interprets as non-empty string, thus always true. This does not
    match the logic above though, so replace the test with check which
    passes only for UBOOT_SIGN_ENABLE = 1 .
    
    Signed-off-by: Marek Vasut <marex at denx.de>
    Cc: Yannick Gicquel <yannick.gicquel at iot.bzh>
    Cc: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/kernel-fitimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 809bd4d..298eda2 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -250,7 +250,7 @@ do_assemble_fitimage() {
 		#
 		# Step 5: Sign the image and add public key to U-Boot dtb
 		#
-		if test -n "${UBOOT_SIGN_ENABLE}"; then
+		if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
 			uboot-mkimage \
 				${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
 				-F -k "${UBOOT_SIGN_KEYDIR}" \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.