diff options
author | Dennis Herbrich <dennis.herbrich@hytera.de> | 2013-03-12 17:12:19 +0100 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-03-13 12:34:24 +0100 |
commit | cd7805b5719bf67422dc9d74fb7852244e3220dc (patch) | |
tree | 1b37c9db69ee8212e4773b2da12383cf18d66f29 | |
parent | 0993be06c8a082f9fa98c3db0ed57fb944436365 (diff) | |
download | ptxdist-cd7805b5719bf67422dc9d74fb7852244e3220dc.tar.gz ptxdist-cd7805b5719bf67422dc9d74fb7852244e3220dc.tar.xz |
ptxdist: setup: added proxy exception configuration
Signed-off-by: Dennis Herbrich <dennis.herbrich@hytera.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rwxr-xr-x | bin/ptxdist | 5 | ||||
-rw-r--r-- | config/setup/Kconfig | 11 | ||||
-rw-r--r-- | config/setup/ptxdistrc.default | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index ded63027f..95382e632 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2015,7 +2015,7 @@ setup_env() { unset $(/usr/bin/env | \ sed -n -e "s/^\([^=[:space:]]\+\)=.*$/\1/p" | \ - egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|https_proxy|ftp_proxy${whitelist})$" ) + egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|https_proxy|ftp_proxy|no_proxy${whitelist})$" ) ######## the environment is clean now ######## @@ -2163,6 +2163,9 @@ setup_config() { export ftp_proxy="${PTXCONF_SETUP_FTP_PROXY}" fi + if [ -n "${PTXCONF_SETUP_NO_PROXY}" ]; then + export no_proxy="${PTXCONF_SETUP_NO_PROXY}" + fi # # setup PARALLELMFLAGS diff --git a/config/setup/Kconfig b/config/setup/Kconfig index 2d4d5bcc1..63592f95b 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -66,6 +66,17 @@ config SETUP_HTTPS_PROXY http://your.proxy.org:80 +config SETUP_NO_PROXY + prompt "Proxy Exceptions" + string + default "" + help + If you generally require a proxy, but need to add exceptions for + certain hosts, please add those as a comma-separated list here. + Example: + + .localdomain,127.0.0.1 + endmenu menu "Project Searchpath" diff --git a/config/setup/ptxdistrc.default b/config/setup/ptxdistrc.default index 6cedfe5f4..37376d2d9 100644 --- a/config/setup/ptxdistrc.default +++ b/config/setup/ptxdistrc.default @@ -19,6 +19,7 @@ PTXCONF_SETUP_USER_EMAIL="" PTXCONF_SETUP_FTP_PROXY="" PTXCONF_SETUP_HTTP_PROXY="" PTXCONF_SETUP_HTTPS_PROXY="" +PTXCONF_SETUP_NO_PROXY="" # # Project Searchpath |