diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2010-09-29 01:42:42 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-07 10:18:25 +0100 |
| commit | 0a20caf0909f5429176e664a8992ebe2b9ad37c9 (patch) | |
| tree | f6114398bbc65ec32f6560311fe29612c1361676 | |
| parent | e12c57e877b64d108c7e774c7785236436058973 (diff) | |
| download | poky-0a20caf0909f5429176e664a8992ebe2b9ad37c9.tar.gz | |
Export ALL_PROXY for bitbake commands
We already export http,ftp,https proxy environment variables. Some environments,
GNOME for instance, place the socks proxy in ALL_PROXY and all_proxy. Export it
as well.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
| -rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 5 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 65ac468797..c678e6185c 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py | |||
| @@ -408,7 +408,10 @@ def runfetchcmd(cmd, d, quiet = False): | |||
| 408 | # rather than host provided | 408 | # rather than host provided |
| 409 | # Also include some other variables. | 409 | # Also include some other variables. |
| 410 | # FIXME: Should really include all export varaiables? | 410 | # FIXME: Should really include all export varaiables? |
| 411 | exportvars = ['PATH', 'GIT_PROXY_COMMAND', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'GIT_CONFIG', 'http_proxy', 'ftp_proxy', 'https_proxy', 'no_proxy', 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME'] | 411 | exportvars = ['PATH', 'GIT_PROXY_COMMAND', 'GIT_PROXY_HOST', |
| 412 | 'GIT_PROXY_PORT', 'GIT_CONFIG', 'http_proxy', 'ftp_proxy', | ||
| 413 | 'https_proxy', 'no_proxy', 'ALL_PROXY', 'all_proxy', | ||
| 414 | 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME'] | ||
| 412 | 415 | ||
| 413 | for var in exportvars: | 416 | for var in exportvars: |
| 414 | val = data.getVar(var, d, True) | 417 | val = data.getVar(var, d, True) |
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index f425bab079..52747bf5c3 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal | |||
| @@ -132,4 +132,4 @@ You can also run generated qemu images with a command like 'runqemu qemux86' | |||
| 132 | 132 | ||
| 133 | EOM | 133 | EOM |
| 134 | 134 | ||
| 135 | export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy https_proxy no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND" | 135 | export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND" |