Ticket #11305: 0001-Use-a-TORSOCKS-make-variable.patch

File 0001-Use-a-TORSOCKS-make-variable.patch, 2.1 KB (added by dcf, 7 years ago)
  • gitian/Makefile

    From 96c8eab41208c3c65617b2f6f65fa79d52f5717b Mon Sep 17 00:00:00 2001
    From: David Fifield <david@bamsoftware.com>
    Date: Mon, 24 Mar 2014 14:47:28 -0700
    Subject: [PATCH] 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 b  
     1TORSOCKS = torsocks
     2
    13all: clean prep build
    24
    35nightly: clean prep-nightly build-nightly
    build-beta: 
    3133        ./hash-bundles.sh versions.beta
    3234
    3335sign:
    34         torsocks ./upload-signature.sh versions
     36        $(TORSOCKS) ./upload-signature.sh versions
    3537
    3638sign-alpha:
    37         torsocks ./upload-signature.sh versions.alpha
     39        $(TORSOCKS) ./upload-signature.sh versions.alpha
    3840
    3941sign-nightly:
    4042        ./upload-signature.sh versions.nightly
    4143
    4244sign-beta:
    43         torsocks ./upload-signature.sh versions.beta
     45        $(TORSOCKS) ./upload-signature.sh versions.beta
    4446
    4547match:
    46         torsocks ./check-match.sh versions
     48        $(TORSOCKS) ./check-match.sh versions
    4749
    4850match-nightly:
    4951        ./check-match.sh versions.nightly
    5052
    5153match-alpha:
    52         torsocks ./check-match.sh versions.alpha
     54        $(TORSOCKS) ./check-match.sh versions.alpha
    5355
    5456match-beta:
    55         torsocks ./check-match.sh versions.beta
     57        $(TORSOCKS) ./check-match.sh versions.beta
    5658
    5759prep:
    5860        ./check-prerequisites.sh
    59         torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions
     61        $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions
    6062
    6163prep-nightly:
    6264        ./check-prerequisites.sh
    prep-nightly: 
    6466
    6567prep-alpha:
    6668        ./check-prerequisites.sh
    67         torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha
     69        $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha
    6870
    6971prep-beta:
    7072        ./check-prerequisites.sh
    71         torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta
     73        $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta
    7274
    7375clean:
    7476        rm -f ../../gitian-builder/inputs/*gbuilt*