From 75cec07a03da6ecbc4ca8ecc2ef78fac4b94d4b3 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Wed, 16 Dec 2015 13:24:07 -0800 Subject: 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. (From OE-Core rev: 9ae79973cfdabd1b4dacddce32735c65fe3544e4) Signed-off-by: Juro Bystricky Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/oe-buildenv-internal') diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 51e449ac3b..457763b794 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 -- cgit v1.2.3-54-g00ecf