aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-04-04 16:16:19 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-05 15:00:04 +0100
commit773e9ef9bacbf1e63fe758915d599d11762b8c1f (patch)
treebfb29a2f877d04a210e5e10da8f5f61713d1bf4c
parentd00b2250a6afebd7d1373c04b4006290f0cd4043 (diff)
downloadopenembedded-core-contrib-773e9ef9bacbf1e63fe758915d599d11762b8c1f.tar.gz
openembedded-core-contrib-773e9ef9bacbf1e63fe758915d599d11762b8c1f.tar.bz2
openembedded-core-contrib-773e9ef9bacbf1e63fe758915d599d11762b8c1f.zip
scripts/oe-buildenv-internal: Fix regression in BB_ENV_EXTRAWHITE setting
The commit OE-Core:ada4639 (oe-buildenv-internal: simplify derivation of BB_ENV_EXTRAWHITE) changed the format of BB_ENV_EXTRAWHITE variable to: ,---- | BB_ENV_EXTRAWHITE='ALL_PROXY | BB_NO_NETWORK | BB_NUMBER_THREADS | ... | ' `---- Instead of: ,---- | BB_ENV_EXTRAWHITE='ALL_PROXY BB_NO_NETWORK BB_NUMBER_THREADS...' `---- The old format allow for external script parsing easier and there is no need to change the format as it has no benefit from usage perspective. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-buildenv-internal2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index be212f2cd0..e04db0398d 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -116,6 +116,6 @@ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \
SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \
SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
-BB_ENV_EXTRAWHITE=$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | sed 's/ /\n/g' | LC_ALL=C sort --unique)
+BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')"
export BB_ENV_EXTRAWHITE