summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2016-11-09 14:48:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:21:41 +0000
commit31d4000b150a5a9daa37aeed5a75f9a183706b2f (patch)
tree71db69272c770a1fe4a06f38fa097ff4d8663077
parenta469b6efc6a267bfdda109ef15356419b3f62cb1 (diff)
downloadpoky-31d4000b150a5a9daa37aeed5a75f9a183706b2f.tar.gz
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. (From OE-Core rev: 0526524c74d4c9019fb014a2984119987f6ce9d3) (From OE-Core rev: 2ece9c0e955ee99543968ddfd14da909e23ae611) Signed-off-by: André Draszik <adraszik@tycoint.com> Reviewed-by: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
index 25ea729ac1..6620fdcb53 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()
148 then 148 then
149 FILE=$( readlink ${FILE} ) 149 FILE=$( readlink ${FILE} )
150 # check the symlink is absolute (or dangling in other word) 150 # check the symlink is absolute (or dangling in other word)
151 if [ "x/" == "x$( echo ${FILE} | cut -c1 -)" ] 151 if [ "x/" = "x$( echo ${FILE} | cut -c1 -)" ]
152 then 152 then
153 REAL_FILE=${SYSROOT}/${FILE} 153 REAL_FILE=${SYSROOT}/${FILE}
154 fi 154 fi