diff options
author | Diego Elio Pettenò <flameeyes@gmail.com> | 2010-09-03 03:41:02 +0200 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gmail.com> | 2010-09-03 03:41:02 +0200 |
commit | 35eb7ec0780396b6ca95e117aa75978ce1ee2679 (patch) | |
tree | 0e97f23eb9eaf7b9558f0988508f37925b631c65 | |
parent | Add a proper license to all the scripts running the Tinderbox. (diff) | |
download | flameeyes-tinderbox-35eb7ec0780396b6ca95e117aa75978ce1ee2679.tar.gz flameeyes-tinderbox-35eb7ec0780396b6ca95e117aa75978ce1ee2679.tar.bz2 flameeyes-tinderbox-35eb7ec0780396b6ca95e117aa75978ce1ee2679.zip |
Make /etc/make.tinderbox.private.conf the place to set BTI and PROXY settings.
Make bti in bashrc use the TINDERBOX_PROXY variable rather than BTI_PROXY,
and also set curl (with proxy) for fetch and resume.
Note: don't set the proxy in the environment or the isolation will fail;
unfortunately wget can be told to ignore proxies but _not_ to use them, on
the command line, which is why we went with curl.
-rwxr-xr-x | bashrc | 2 | ||||
-rw-r--r-- | tinderbox.make.conf | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -17,7 +17,7 @@ # SOFTWARE. dent_me() { - echo "$@" | bti ${BTI_PROXY:+--proxy "${BTI_PROXY}"} --host "${BTI_HOST}" --account "${BTI_ACCOUNT}" --password "${BTI_PASSWORD}" >/dev/null + echo "$@" | bti ${TINDERBOX_PROXY:+--proxy "${TINDERBOX_PROXY}"} --host "${BTI_HOST}" --account "${BTI_ACCOUNT}" --password "${BTI_PASSWORD}" >/dev/null } metadata_print() { diff --git a/tinderbox.make.conf b/tinderbox.make.conf index dd20717..7dedf5b 100644 --- a/tinderbox.make.conf +++ b/tinderbox.make.conf @@ -14,6 +14,11 @@ # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS # SOFTWARE. +source /etc/make.tinderbox.private.conf + +FETCHCOMMAND="/usr/bin/curl --location ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} --output \${DISTDIR}/\${FILE} \${URI}" +RESUMECOMMAND="/usr/bin/curl --location ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} --continue-at - --output \${DISTDIR}/\${FILE} \${URI}" + FEATURES="test test-fail-continue -unmerge-logs split-log userpriv usersandbox compress-build-logs -preserve-libs" ACCEPT_LICENSE="*" |