From 3ff080d312942abbcbbb1de5631b38f237f72400 Mon Sep 17 00:00:00 2001
From: gdm85 <gdm85@users.noreply.github.com>
Date: Wed, 11 Jun 2014 06:56:02 +0200
Subject: [PATCH] * support different descriptors across versions

---
 docker/gitian-bitcoin-host/build-bitcoin.sh               | 8 ++++----
 .../input-sources/0.9.1-descriptors.txt                   | 2 ++
 .../input-sources/{0.9.1.txt.md5 => 0.9.1-inputs.md5}     | 0
 .../input-sources/{0.9.1.txt => 0.9.1-inputs.txt}         | 0
 .../input-sources/0.9.2rc2-descriptors.txt                | 3 +++
 .../{0.9.2rc2.txt.md5 => 0.9.2rc2-inputs.md5}             | 0
 .../input-sources/{0.9.2rc2.txt => 0.9.2rc2-inputs.txt}   | 0
 7 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 docker/gitian-bitcoin-host/input-sources/0.9.1-descriptors.txt
 rename docker/gitian-bitcoin-host/input-sources/{0.9.1.txt.md5 => 0.9.1-inputs.md5} (100%)
 rename docker/gitian-bitcoin-host/input-sources/{0.9.1.txt => 0.9.1-inputs.txt} (100%)
 create mode 100644 docker/gitian-bitcoin-host/input-sources/0.9.2rc2-descriptors.txt
 rename docker/gitian-bitcoin-host/input-sources/{0.9.2rc2.txt.md5 => 0.9.2rc2-inputs.md5} (100%)
 rename docker/gitian-bitcoin-host/input-sources/{0.9.2rc2.txt => 0.9.2rc2-inputs.txt} (100%)

diff --git a/docker/gitian-bitcoin-host/build-bitcoin.sh b/docker/gitian-bitcoin-host/build-bitcoin.sh
index 2dbd426..43508d1 100755
--- a/docker/gitian-bitcoin-host/build-bitcoin.sh
+++ b/docker/gitian-bitcoin-host/build-bitcoin.sh
@@ -33,10 +33,10 @@ done < ../../input-sources/${VERSION}.txt | parallel -j10 || exit $?
 ## verify that all sources are correct before continuing
 md5sum -c < ../../input-sources/${VERSION}.txt.md5 && \
 cd .. && \
-./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-linux.yml && \
-mv build/out/boost-*.zip inputs/ && \
-./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml && \
-mv build/out/bitcoin-deps-*.zip inputs/ && \
+for DESC in $(<../../input-sources/${VERSION}-descriptors.txt); do
+	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/${DESC}.yml && \
+	mv build/out/*.zip inputs/ || exit $?
+done && \
 ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml && \
 echo "Completed successfully." && \
 echo "The output files are in: gitian-builder/build/out/"
diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.1-descriptors.txt b/docker/gitian-bitcoin-host/input-sources/0.9.1-descriptors.txt
new file mode 100644
index 0000000..ffa8b5e
--- /dev/null
+++ b/docker/gitian-bitcoin-host/input-sources/0.9.1-descriptors.txt
@@ -0,0 +1,2 @@
+boost-linux
+deps-linux
diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.1.txt.md5 b/docker/gitian-bitcoin-host/input-sources/0.9.1-inputs.md5
similarity index 100%
rename from docker/gitian-bitcoin-host/input-sources/0.9.1.txt.md5
rename to docker/gitian-bitcoin-host/input-sources/0.9.1-inputs.md5
diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.1.txt b/docker/gitian-bitcoin-host/input-sources/0.9.1-inputs.txt
similarity index 100%
rename from docker/gitian-bitcoin-host/input-sources/0.9.1.txt
rename to docker/gitian-bitcoin-host/input-sources/0.9.1-inputs.txt
diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.2rc2-descriptors.txt b/docker/gitian-bitcoin-host/input-sources/0.9.2rc2-descriptors.txt
new file mode 100644
index 0000000..0e4585f
--- /dev/null
+++ b/docker/gitian-bitcoin-host/input-sources/0.9.2rc2-descriptors.txt
@@ -0,0 +1,3 @@
+boost-linux
+deps-linux
+qt-linux
diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.2rc2.txt.md5 b/docker/gitian-bitcoin-host/input-sources/0.9.2rc2-inputs.md5
similarity index 100%
rename from docker/gitian-bitcoin-host/input-sources/0.9.2rc2.txt.md5
rename to docker/gitian-bitcoin-host/input-sources/0.9.2rc2-inputs.md5
diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.2rc2.txt b/docker/gitian-bitcoin-host/input-sources/0.9.2rc2-inputs.txt
similarity index 100%
rename from docker/gitian-bitcoin-host/input-sources/0.9.2rc2.txt
rename to docker/gitian-bitcoin-host/input-sources/0.9.2rc2-inputs.txt