commit 93a1c3135730f10575e6a0aa368bedd087cb4618 Author: David Fifield david@bamsoftware.com Date: Mon Mar 24 14:47:28 2014 -0700

Use a TORSOCKS make variable.

This allows you to selectively disable torsocks from the command line using a command like make prep TORSOCKS= --- gitian/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gitian/Makefile b/gitian/Makefile index e483735..cec338d 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,3 +1,5 @@ +TORSOCKS = torsocks + all: clean prep build

nightly: clean prep-nightly build-nightly @@ -31,32 +33,32 @@ build-beta: ./hash-bundles.sh versions.beta

sign: - torsocks ./upload-signature.sh versions + $(TORSOCKS) ./upload-signature.sh versions

sign-alpha: - torsocks ./upload-signature.sh versions.alpha + $(TORSOCKS) ./upload-signature.sh versions.alpha

sign-nightly: ./upload-signature.sh versions.nightly

sign-beta: - torsocks ./upload-signature.sh versions.beta + $(TORSOCKS) ./upload-signature.sh versions.beta

match: - torsocks ./check-match.sh versions + $(TORSOCKS) ./check-match.sh versions

match-nightly: ./check-match.sh versions.nightly

match-alpha: - torsocks ./check-match.sh versions.alpha + $(TORSOCKS) ./check-match.sh versions.alpha

match-beta: - torsocks ./check-match.sh versions.beta + $(TORSOCKS) ./check-match.sh versions.beta

prep: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions

prep-nightly: ./check-prerequisites.sh @@ -64,11 +66,11 @@ prep-nightly:

prep-alpha: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha

prep-beta: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta

clean: rm -f ../../gitian-builder/inputs/*gbuilt*