diff options
| author | Jon Ringle <jon@ringle.org> | 2011-09-25 22:17:36 -0400 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-09-29 11:10:14 +0200 |
| commit | 6503766eaa49cc823ba1dc2dccff0115270d0d1d (patch) | |
| tree | 78e0983a8fa2ecc9839d4aa4becf2469d776e5fe | |
| parent | 38bfdbcb71ab4c8ab845851f5a09e8966b527005 (diff) | |
| download | ptxdist-6503766eaa49cc823ba1dc2dccff0115270d0d1d.tar.gz ptxdist-6503766eaa49cc823ba1dc2dccff0115270d0d1d.tar.xz | |
ptxdist: allow PTXDIST_PTXRC_DEFAULT to be set from environment
Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rwxr-xr-x | bin/ptxdist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 06e28fc5c..900af0f23 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -17,7 +17,7 @@ PTXDIST_PLATFORMCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_platformconfig' PTXDIST_PLATFORMCONFIG_FALLBACK='${PTXDIST_WORKSPACE}/configs/*/platformconfig' PTXDIST_COLLECTIONCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_collectionconfig' PTXDIST_TOOLCHAIN_DEFAULT='${PTXDIST_WORKSPACE}/selected_toolchain' -PTXDIST_PTXRC_DEFAULT='${HOME}/.ptxdist/ptxdistrc-${PTXDIST_VERSION_PTXRC}' +PTXDIST_PTXRC_DEFAULT=${PTXDIST_PTXRC:-'${HOME}/.ptxdist/ptxdistrc-${PTXDIST_VERSION_PTXRC}'} # @@ -2149,7 +2149,7 @@ setup_env() { unset $(/usr/bin/env | \ sed -n -e "s/^\([^=[:space:]]\+\)=.*$/\1/p" | \ - egrep -v "^(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|ftp_proxy${whitelist})$" ) ######## the environment is clean now ######## |