From f4e72bf8d20f590738a1307fff0787bb2aa870c8 Mon Sep 17 00:00:00 2001
From: Micha <michagogo@server.fake>
Date: Wed, 15 Jan 2014 22:51:37 +0200
Subject: [PATCH] Make gitian builds consistent across platforms

Change Linux deps to use a zip archive rather than a gzipped tarball to
match win32
Rename Linux descriptor to gitian-linux.yml to match win32
---
 contrib/gitian-descriptors/README.md                        | 2 +-
 contrib/gitian-descriptors/deps-linux.yml                   | 3 ++-
 contrib/gitian-descriptors/{gitian.yml => gitian-linux.yml} | 6 +++---
 doc/release-process.md                                      | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename contrib/gitian-descriptors/{gitian.yml => gitian-linux.yml} (91%)

diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md
index 7f4f6705e..3a90b4d03 100644
--- a/contrib/gitian-descriptors/README.md
+++ b/contrib/gitian-descriptors/README.md
@@ -39,7 +39,7 @@ Once you've got the right hardware and software:
     git pull
     cd ../gitian-builder
     git pull
-    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian.yml
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
 
     # Build Win32 dependencies: (only needs to be done once, or when dependency versions change)
     ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
diff --git a/contrib/gitian-descriptors/deps-linux.yml b/contrib/gitian-descriptors/deps-linux.yml
index 48f2be2d6..4ebf5c53a 100644
--- a/contrib/gitian-descriptors/deps-linux.yml
+++ b/contrib/gitian-descriptors/deps-linux.yml
@@ -7,6 +7,7 @@ architectures:
 - "amd64"
 packages:
 - "unzip"
+- "zip"
 - "pkg-config"
 - "libtool"
 - "faketime"
@@ -59,4 +60,4 @@ script: |
   cd ../..
   #
   cd $STAGING
-  tar -czf $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.tar.gz include lib bin host
+  zip -r $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip include lib bin host
diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian-linux.yml
similarity index 91%
rename from contrib/gitian-descriptors/gitian.yml
rename to contrib/gitian-descriptors/gitian-linux.yml
index 7ba375f5e..b0fe86e25 100644
--- a/contrib/gitian-descriptors/gitian.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -27,8 +27,8 @@ remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"
 files:
-- "bitcoin-deps-linux32-gitian-r1.tar.gz"
-- "bitcoin-deps-linux64-gitian-r1.tar.gz"
+- "bitcoin-deps-linux32-gitian-r1.zip"
+- "bitcoin-deps-linux64-gitian-r1.zip"
 script: |
   STAGING="$HOME/install"
   OPTFLAGS='-O2'
@@ -38,7 +38,7 @@ script: |
   #
   mkdir -p $STAGING
   cd $STAGING
-  tar xzfm ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.tar.gz
+  unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.zip
   cd ../build
   #
   cd bitcoin
diff --git a/doc/release-process.md b/doc/release-process.md
index 82920afe7..428193681 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -52,7 +52,7 @@ Release Process
 	wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
 	cd ..
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml
-	mv build/out/*.tar.gz inputs/
+	mv build/out/bitcoin-deps-*.zip inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
 	mv build/out/boost-win32-*.zip inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
@@ -64,8 +64,8 @@ Release Process
 
  Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
   
-	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml
-	./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
+	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
+	./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
 	pushd build/out
 	zip -r bitcoin-${VERSION}-linux-gitian.zip *
 	mv bitcoin-${VERSION}-linux-gitian.zip ../../../