summaryrefslogtreecommitdiffstats
path: root/scripts/oe-buildenv-internal
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2015-12-16 13:24:07 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-22 16:08:50 +0000
commit75cec07a03da6ecbc4ca8ecc2ef78fac4b94d4b3 (patch)
treeb3f59e03d39b126ac717fe02aae2a18a96747710 /scripts/oe-buildenv-internal
parent606c9e7f78ab3ba128d85d1e5ffb6b0c110bc46f (diff)
downloadpoky-75cec07a03da6ecbc4ca8ecc2ef78fac4b94d4b3.tar.gz
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 <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-buildenv-internal')
-rwxr-xr-xscripts/oe-buildenv-internal4
1 files changed, 3 insertions, 1 deletions
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 \
110SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR" 110SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
111 111
112echo "$BB_ENV_EXTRAWHITE" | grep -q "${BB_ENV_EXTRAWHITE_OE}" 112echo "$BB_ENV_EXTRAWHITE" | grep -q "${BB_ENV_EXTRAWHITE_OE}"
113[ $? != 0 ] && export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE_OE} $BB_ENV_EXTRAWHITE" 113if [ $? != 0 ]; then
114 export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE_OE} $BB_ENV_EXTRAWHITE"
115fi