diff options
| -rwxr-xr-x | bin/ptxdist | 6 | ||||
| -rw-r--r-- | config/setup/Kconfig | 10 | ||||
| -rw-r--r-- | config/setup/ptxdistrc.default | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 579cedbbd..ded63027f 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|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${whitelist})$" ) ######## the environment is clean now ######## @@ -2155,6 +2155,10 @@ setup_config() { export http_proxy="${PTXCONF_SETUP_HTTP_PROXY}" fi + if [ -n "${PTXCONF_SETUP_HTTPS_PROXY}" ]; then + export https_proxy="${PTXCONF_SETUP_HTTPS_PROXY}" + fi + if [ -n "${PTXCONF_SETUP_FTP_PROXY}" ]; then export ftp_proxy="${PTXCONF_SETUP_FTP_PROXY}" fi diff --git a/config/setup/Kconfig b/config/setup/Kconfig index 266e94298..5ca7786eb 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -56,6 +56,16 @@ config SETUP_HTTP_PROXY http://your.proxy.org:80 +config SETUP_HTTPS_PROXY + prompt "HTTPS Proxy" + string + default "" + help + If you have to use a proxy for HTTP transfers, please add the + proxy URL here. Example: + + http://your.proxy.org:80 + endmenu menu "Project Searchpath" diff --git a/config/setup/ptxdistrc.default b/config/setup/ptxdistrc.default index 53fbaf6f6..6cedfe5f4 100644 --- a/config/setup/ptxdistrc.default +++ b/config/setup/ptxdistrc.default @@ -18,6 +18,7 @@ PTXCONF_SETUP_USER_EMAIL="" # PTXCONF_SETUP_FTP_PROXY="" PTXCONF_SETUP_HTTP_PROXY="" +PTXCONF_SETUP_HTTPS_PROXY="" # # Project Searchpath |