From 0a20caf0909f5429176e664a8992ebe2b9ad37c9 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 29 Sep 2010 01:42:42 -0700 Subject: 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 --- bitbake/lib/bb/fetch/__init__.py | 5 ++++- 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): # rather than host provided # Also include some other variables. # FIXME: Should really include all export varaiables? - 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'] + exportvars = ['PATH', 'GIT_PROXY_COMMAND', 'GIT_PROXY_HOST', + 'GIT_PROXY_PORT', 'GIT_CONFIG', 'http_proxy', 'ftp_proxy', + 'https_proxy', 'no_proxy', 'ALL_PROXY', 'all_proxy', + 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME'] for var in exportvars: 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' EOM -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" +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" -- cgit 1.2.3-korg