diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-02 17:12:45 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-02 17:12:58 +0100 |
| commit | 7c2dea4e925c38d89da835a7a084e02670c36391 (patch) | |
| tree | 7c1eaa6660cf7d292785f7b0f4ae8fbe529863f6 | |
| parent | fe39ce6b23e69391fda962407f2e1241cb2eb366 (diff) | |
| parent | 0d50c2fd81ee7239570954e6eacb3dbbfe3bb5fe (diff) | |
| download | bitcoin-7c2dea4e925c38d89da835a7a084e02670c36391.tar.xz | |
Merge pull request #5569
0d50c2f dmg: fix deterministic dmg creation and docs (Cory Fields)
| -rw-r--r-- | contrib/gitian-descriptors/gitian-osx-signer.yml | 6 | ||||
| -rw-r--r-- | doc/release-process.md | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index db9b4af93d..1792f9de3f 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -10,7 +10,7 @@ packages: reference_datetime: "2013-06-01 00:00:00" remotes: [] files: -- "bitcoin-0.9.99-osx-unsigned.tar.gz" +- "bitcoin-osx-unsigned.tar.gz" - "signature.tar.gz" script: | WRAP_DIR=$HOME/wrapped @@ -28,8 +28,8 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=`echo bitcoin-*.tar.gz` - SIGNED=`echo ${UNSIGNED} | sed 's/.tar.*//' | sed 's/-unsigned//'`.dmg + UNSIGNED=bitcoin-osx-unsigned.tar.gz + SIGNED=bitcoin-osx-signed.dmg tar -xf ${UNSIGNED} ./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz diff --git a/doc/release-process.md b/doc/release-process.md index 30f9797752..eb2eb619bd 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -68,7 +68,7 @@ Release Process mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../ ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml - mv build/out/bitcoin-*-unsigned.tar.gz inputs + mv build/out/bitcoin-*-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../ popd Build output expected: @@ -102,7 +102,7 @@ Commit your signature to gitian.sigs: cp signature.tar.gz inputs/ ./bin/gbuild -i ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml ./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml - mv build/out/bitcoin-${VERSION}-osx.dmg ../ + mv build/out/bitcoin-osx-signed.dmg ../bitcoin-${VERSION}-osx.dmg popd Commit your signature for the signed OSX binary: |