From 1583dac1edf029dc9eb21e02bef71aa8e665b8f6 Mon Sep 17 00:00:00 2001 From: gdm85 Date: Tue, 17 Jun 2014 14:20:41 +0200 Subject: [PATCH] * added descriptors/inputs/hashes for 0.9.2 (same as 0.9.2rc2) * fixed issue with existing input removal * remove part of patch that was merged upstream * more consistent check for gitian host VM creation --- docker/gitian-bitcoin-host/build-bitcoin.sh | 2 +- .../input-sources/0.9.2-descriptors.txt | 3 +++ .../input-sources/0.9.2-inputs.md5 | 11 +++++++++++ .../input-sources/0.9.2-inputs.txt | 11 +++++++++++ docker/gitian-host/gitian.patch | 10 +++------- docker/scripts/create-gitian-host.sh | 10 ++++++++-- 6 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 docker/gitian-bitcoin-host/input-sources/0.9.2-descriptors.txt create mode 100644 docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.md5 create mode 100644 docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.txt diff --git a/docker/gitian-bitcoin-host/build-bitcoin.sh b/docker/gitian-bitcoin-host/build-bitcoin.sh index ab88d12..e34011b 100755 --- a/docker/gitian-bitcoin-host/build-bitcoin.sh +++ b/docker/gitian-bitcoin-host/build-bitcoin.sh @@ -28,7 +28,7 @@ while read -r URL FNAME; do continue fi ## always remove destination. This is because we can't use --continue with SourceForge for example (infinite redirects) - rm "$FNAME" || exit $? + rm -f "$FNAME" || exit $? echo "wget -q --no-check-certificate '$URL' -O '$FNAME'" done < ../../input-sources/${VERSION}-inputs.txt | parallel -j10 || exit $? diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.2-descriptors.txt b/docker/gitian-bitcoin-host/input-sources/0.9.2-descriptors.txt new file mode 100644 index 0000000..0e4585f --- /dev/null +++ b/docker/gitian-bitcoin-host/input-sources/0.9.2-descriptors.txt @@ -0,0 +1,3 @@ +boost-linux +deps-linux +qt-linux diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.md5 b/docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.md5 new file mode 100644 index 0000000..902a26f --- /dev/null +++ b/docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.md5 @@ -0,0 +1,11 @@ +d6eef4b4cacb2183f2bf265a5a03a354 boost_1_55_0.tar.bz2 +efe08e2f3ca478486037b053acd512e9 cdrkit-1.1.11.tar.gz +cea2d01b3206e92a8df7b079935c070b clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz +a14a5486d6b4891d2434039a0ed4c5b7 db-4.8.30.NC.tar.gz +5ef3ba321e6df72d6519b728b292073e miniupnpc-1.9.tar.gz +8d6d684a9430d5cc98a62a5d8fbda8cf openssl-1.0.1h.tar.gz +a72001a9067a4c2c4e0e836d0f92ece4 protobuf-2.5.0.tar.bz2 +89a90a3b8cbca60ac412b2e0e0c776e7 qrencode-3.4.3.tar.bz2 +8ac880cc07a130c39607b65efd5e1421 qt-everywhere-opensource-src-4.6.4.tar.gz +228b6384dfd7272de00fd8b2c144fecd qt-everywhere-opensource-src-5.2.0.tar.gz +44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz diff --git a/docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.txt b/docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.txt new file mode 100644 index 0000000..7a5e13c --- /dev/null +++ b/docker/gitian-bitcoin-host/input-sources/0.9.2-inputs.txt @@ -0,0 +1,11 @@ +http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.tar.gz miniupnpc-1.9.tar.gz +https://www.openssl.org/source/openssl-1.0.1h.tar.gz openssl-1.0.1h.tar.gz +http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz db-4.8.30.NC.tar.gz +http://zlib.net/zlib-1.2.8.tar.gz zlib-1.2.8.tar.gz +https://fukuchi.org/works/qrencode/qrencode-3.4.3.tar.bz2 qrencode-3.4.3.tar.bz2 +https://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2 boost_1_55_0.tar.bz2 +https://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/qt-everywhere-opensource-src-5.2.0.tar.gz qt-everywhere-opensource-src-5.2.0.tar.gz +https://download.qt-project.org/archive/qt/4.6/qt-everywhere-opensource-src-4.6.4.tar.gz qt-everywhere-opensource-src-4.6.4.tar.gz +https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2 protobuf-2.5.0.tar.bz2 +http://cdrkit.org/releases/cdrkit-1.1.11.tar.gz cdrkit-1.1.11.tar.gz +http://llvm.org/releases/3.2/clang+llvm-3.2-x86-linux-ubuntu-12.04.tar.gz clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz diff --git a/docker/gitian-host/gitian.patch b/docker/gitian-host/gitian.patch index bca56ba..cedc9b8 100644 --- a/docker/gitian-host/gitian.patch +++ b/docker/gitian-host/gitian.patch @@ -1,13 +1,9 @@ diff --git a/bin/make-base-vm b/bin/make-base-vm -index c1920f3..a5935fb 100755 +index d82b3d6..a5935fb 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm -@@ -106,19 +106,6 @@ fi - - libexec/config-bootstrap-fixup - rm -rf $OUT --sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup -+env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup +@@ -109,16 +109,3 @@ rm -rf $OUT + env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup mv $OUT/*.qcow2 $OUT.qcow2 rm -rf $OUT - diff --git a/docker/scripts/create-gitian-host.sh b/docker/scripts/create-gitian-host.sh index c4d377e..5fb56cc 100755 --- a/docker/scripts/create-gitian-host.sh +++ b/docker/scripts/create-gitian-host.sh @@ -30,6 +30,13 @@ function wait_for_ssh() { return 1 } +function wait_remove() { + local CID="$1" + while [ ! docker rm $CID 2>/dev/null ]; do + sleep 2 + done +} + ##NOTE: can leave behind a running container of gitian-host docker build --tag=gdm85/gitian-host . && \ CID=$(docker run -d --privileged gdm85/gitian-host) && \ @@ -40,7 +47,6 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no debian@$IP ./bui docker kill $CID && \ docker wait $CID && \ docker commit $CID gdm85/gitian-host-vms && \ -sleep 3 && \ -docker rm $CID && \ +sleep 3 && wait_remove $CID && \ echo "Gitian host images created successfully!" && \ echo "You can now spawn containers with spawn-gitian-host.sh"