]> code.ossystems Code Review - openembedded-core.git/commitdiff
oe-buildenv-internal: fix return code
authorJuro Bystricky <juro.bystricky@intel.com>
Wed, 16 Dec 2015 21:24:07 +0000 (13:24 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 22 Dec 2015 16:08:42 +0000 (16:08 +0000)
The script oe-buildenv-internal is called from oe-init-build-env.
Make sure oe-init-buildenv does not return an error if BB_ENV_EXTRAWHITE is
already set, otherwise this will cause oe-init-build-env to fail.

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/oe-buildenv-internal

index 51e449ac3bdb355d320a42438047abb5c32f6b4e..457763b7943a4e3bc5c0ac79391d5cd127aa17e8 100755 (executable)
@@ -110,4 +110,6 @@ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \
 SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
 
 echo "$BB_ENV_EXTRAWHITE" | grep -q "${BB_ENV_EXTRAWHITE_OE}"
-[ $? != 0 ] && export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE_OE} $BB_ENV_EXTRAWHITE"
+if [ $? != 0 ]; then
+     export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE_OE} $BB_ENV_EXTRAWHITE"
+fi