commit bc8eb2befd19fd13798f9a0527b2fa821555408e Author: Kathy Brade brade@pearlcrescent.com Date: Fri Mar 6 16:38:48 2015 -0500

Bug 15023: Build MAR tools archive deterministically.

Use dzip.sh to create the mar-tools-*.zip files. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index a1abf2e..3a144ca 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -154,7 +154,7 @@ script: | cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done cd ~/build - zip -r mar-tools-linux${GBUILD_BITS}.zip mar-tools + ~/build/dzip.sh mar-tools-linux${GBUILD_BITS}.zip mar-tools cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ # # Strip and generate debuginfo for the firefox binary that we keep, all *.so diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 9126f03..f609268 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -92,7 +92,7 @@ script: | cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd ~/build - zip -r mar-tools-mac${GBUILD_BITS}.zip mar-tools + ~/build/dzip.sh mar-tools-mac${GBUILD_BITS}.zip mar-tools cp -p mar-tools-mac${GBUILD_BITS}.zip $OUTDIR/ # cd $INSTDIR diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 07c082b..c5f2c41 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -116,7 +116,7 @@ script: | cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd ~/build - zip -r mar-tools-win32.zip mar-tools + ~/build/dzip.sh mar-tools-win32.zip mar-tools cp mar-tools-win32.zip $OUTDIR/

# Making the .ja files deterministic and grabbing the results