diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/oe-buildenv-internal | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 8eee0087a9..be212f2cd0 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal | |||
@@ -110,29 +110,12 @@ unset BITBAKEDIR newpath | |||
110 | export BUILDDIR | 110 | export BUILDDIR |
111 | export PATH | 111 | export PATH |
112 | 112 | ||
113 | add_extrawhite() { | 113 | BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ |
114 | # If the current shell is zsh, then temporarily set it to emulate sh in this | ||
115 | # function so that the for and case statements below work as expected. | ||
116 | [ -z "$ZSH_NAME" ] || emulate -L sh | ||
117 | |||
118 | local extrawhite="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ | ||
119 | HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ | 114 | HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ |
120 | all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ | 115 | all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ |
121 | SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ | 116 | SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ |
122 | SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR" | 117 | SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR" |
123 | 118 | ||
124 | local var | 119 | BB_ENV_EXTRAWHITE=$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | sed 's/ /\n/g' | LC_ALL=C sort --unique) |
125 | for var in $extrawhite; do | 120 | |
126 | case " $BB_ENV_EXTRAWHITE " in | ||
127 | *[[:blank:]]$var[[:blank:]]*) | ||
128 | ;; | ||
129 | *) | ||
130 | BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE:+$BB_ENV_EXTRAWHITE }$var" | ||
131 | ;; | ||
132 | esac | ||
133 | done | ||
134 | } | ||
135 | |||
136 | add_extrawhite | ||
137 | unset -f add_extrawhite | ||
138 | export BB_ENV_EXTRAWHITE | 121 | export BB_ENV_EXTRAWHITE |