From: Juro Bystricky Date: Wed, 16 Dec 2015 21:24:07 +0000 (-0800) Subject: oe-buildenv-internal: fix return code X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~27981 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ae79973cfdabd1b4dacddce32735c65fe3544e4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git oe-buildenv-internal: fix return code 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 Signed-off-by: Ross Burton --- diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 51e449ac3bd..457763b7943 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -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