summaryrefslogtreecommitdiffstats
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-06 10:29:23 +0100
commit672545b74b60a86cba6d98dd93eaf3fa22ff1872 (patch)
tree6fd9d0b31494b805976b8939398d172232c18c68
parentf7fed7ce75457a270443fba926eaf0fdcffbf998 (diff)
downloadpoky-672545b74b60a86cba6d98dd93eaf3fa22ff1872.tar.gz
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. (From OE-Core rev: 773e9ef9bacbf1e63fe758915d599d11762b8c1f) 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 \
116SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ 116SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \
117SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR" 117SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
118 118
119BB_ENV_EXTRAWHITE=$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | sed 's/ /\n/g' | LC_ALL=C sort --unique) 119BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')"
120 120
121export BB_ENV_EXTRAWHITE 121export BB_ENV_EXTRAWHITE