oe-buildenv-internal: simplify derivation of BB_ENV_EXTRAWHITE
Use 'sort --unique' to combine the two lists and remove duplicates. (From OE-Core rev: ada4639f1e2952e144ea7dfb2a784181d7fcc96a) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c6ab82882c
commit
33a6135294
|
@ -110,29 +110,12 @@ unset BITBAKEDIR newpath
|
||||||
export BUILDDIR
|
export BUILDDIR
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
add_extrawhite() {
|
BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \
|
||||||
# If the current shell is zsh, then temporarily set it to emulate sh in this
|
|
||||||
# function so that the for and case statements below work as expected.
|
|
||||||
[ -z "$ZSH_NAME" ] || emulate -L sh
|
|
||||||
|
|
||||||
local extrawhite="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \
|
|
||||||
HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \
|
HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \
|
||||||
all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \
|
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 \
|
SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \
|
||||||
SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
|
SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
|
||||||
|
|
||||||
local var
|
BB_ENV_EXTRAWHITE=$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | sed 's/ /\n/g' | LC_ALL=C sort --unique)
|
||||||
for var in $extrawhite; do
|
|
||||||
case " $BB_ENV_EXTRAWHITE " in
|
|
||||||
*[[:blank:]]$var[[:blank:]]*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE:+$BB_ENV_EXTRAWHITE }$var"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
add_extrawhite
|
|
||||||
unset -f add_extrawhite
|
|
||||||
export BB_ENV_EXTRAWHITE
|
export BB_ENV_EXTRAWHITE
|
||||||
|
|
Loading…
Reference in New Issue