[oe-commits] [openembedded-core] 07/60: openssl: fix bashism in c_rehash shell script

git at git.openembedded.org git at git.openembedded.org
Wed Nov 23 11:11:18 UTC 2016


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

commit 0526524c74d4c9019fb014a2984119987f6ce9d3
Author: André Draszik <adraszik at tycoint.com>
AuthorDate: Wed Nov 9 14:48:53 2016 +0000

    openssl: fix bashism in c_rehash shell script
    
    This script claims to be a /bin/sh script, but it uses
    a bashism:
    
    from checkbashisms:
    
    possible bashism in meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh line 151 (should be 'b = a'):
    	    if [ "x/" == "x$( echo ${FILE} | cut -c1 -)" ]
    
    This causes build issues on systems that don't have
    /bin/sh symlinked to bash:
    
    Updating certificates in ${WORKDIR}/rootfs/etc/ssl/certs...
    <builddir>/tmp/sysroots/x86_64-linux/usr/bin/c_rehash: 151: [: x/: unexpected operator
     ...
    
    Fix this by using POSIX shell syntax for the comparison.
    
    Signed-off-by: André Draszik <adraszik at tycoint.com>
    Reviewed-by: Sylvain Lemieux <slemieux at tycoint.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
index 25ea729..6620fdc 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
@@ -148,7 +148,7 @@ hash_dir()
 	then
 	    FILE=$( readlink ${FILE} )
 	    # check the symlink is absolute (or dangling in other word)
-	    if [ "x/" == "x$( echo ${FILE} | cut -c1 -)" ]
+	    if [ "x/" = "x$( echo ${FILE} | cut -c1 -)" ]
 	    then
 		REAL_FILE=${SYSROOT}/${FILE}
 	    fi

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


More information about the Openembedded-commits mailing list