diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-16 09:37:52 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-16 09:38:24 +0100 |
| commit | 417aad4a38df25deea52881aa1881f0dbd3e51d3 (patch) | |
| tree | 6c182a7c803c58db227887e9a8bd3d0386e4d9f5 | |
| parent | 4b4b578cb32737d2face45438069db95bc316ebb (diff) | |
| parent | f4e72bf8d20f590738a1307fff0787bb2aa870c8 (diff) | |
Merge pull request #3546
f4e72bf Make gitian builds consistent across platforms (Micha)
| -rw-r--r-- | contrib/gitian-descriptors/README.md | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/deps-linux.yml | 3 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-linux.yml (renamed from contrib/gitian-descriptors/gitian.yml) | 6 | ||||
| -rw-r--r-- | doc/release-process.md | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 7f4f6705ea..3a90b4d038 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 48f2be2d65..4ebf5c53a3 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 index 7ba375f5e4..b0fe86e259 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 82920afe7b..4281936819 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 ../../../ |