summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDennis Herbrich <dennis.herbrich@hytera.de>2013-03-12 17:12:19 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-03-13 12:34:24 +0100
commitcd7805b5719bf67422dc9d74fb7852244e3220dc (patch)
tree1b37c9db69ee8212e4773b2da12383cf18d66f29 /config
parent0993be06c8a082f9fa98c3db0ed57fb944436365 (diff)
downloadptxdist-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>
Diffstat (limited to 'config')
-rw-r--r--config/setup/Kconfig11
-rw-r--r--config/setup/ptxdistrc.default1
2 files changed, 12 insertions, 0 deletions
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