summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-09-10 10:00:01 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-10 11:47:38 +0100
commit566de26cf56d6aaea017315cb927d42ed00b3c96 (patch)
treec69ed5abd5312e443e70244835ef5bcf88fb56c3
parent3a530fb3a3c65dfba8f5e5d45b32ba29d7f20415 (diff)
downloadpoky-566de26cf56d6aaea017315cb927d42ed00b3c96.tar.gz
bitbake: Add proxy variables to standard export list
With "no_proxy" exported to bitbake, both internal and externel file mirror can be used. "https_proxy" enable fetching "https://" file through proxy. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--bitbake/lib/bb/fetch/__init__.py2
-rwxr-xr-xscripts/poky-env-internal2
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index 6ff7af32c5..d0931ec9c3 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -400,7 +400,7 @@ def runfetchcmd(cmd, d, quiet = False):
400 # rather than host provided 400 # rather than host provided
401 # Also include some other variables. 401 # Also include some other variables.
402 # FIXME: Should really include all export varaiables? 402 # FIXME: Should really include all export varaiables?
403 exportvars = ['PATH', 'GIT_PROXY_COMMAND', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'GIT_CONFIG', 'http_proxy', 'ftp_proxy', 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME'] 403 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']
404 404
405 for var in exportvars: 405 for var in exportvars:
406 val = data.getVar(var, d, True) 406 val = data.getVar(var, d, True)
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index e8d8f2b037..5250e5f545 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -118,4 +118,4 @@ echo "Common targets are poky-image-minimal, poky-image-sato, meta-toolchain or
118echo 118echo
119echo "You can also run generated qemu images with a command like 'runqemu qemux86'" 119echo "You can also run generated qemu images with a command like 'runqemu qemux86'"
120 120
121export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND" 121export 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"