aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-11-19 21:46:40 -0500
committerCory Fields <cory-nospam-@coryfields.com>2014-11-19 22:49:41 -0500
commit246659aff15885e2289ac774debcef932a25f063 (patch)
treee0734dad4fd37f3b7fb9a5e5c01db5c49fd4defd
parentc54d647a92c72e44daf886a334250ad1125818e9 (diff)
gitian: make tarballs deterministic and nuke .la files from build output
-rw-r--r--contrib/gitian-descriptors/gitian-linux.yml10
-rw-r--r--contrib/gitian-descriptors/gitian-osx.yml10
-rw-r--r--contrib/gitian-descriptors/gitian-win.yml10
3 files changed, 30 insertions, 0 deletions
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 69de6bf623..b57a04469c 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -75,6 +75,13 @@ script: |
make dist
DISTNAME=`echo bitcoin-*.tar.gz`
+ # Correct tar file order
+ mkdir -p temp
+ pushd temp
+ tar xf ../$DISTNAME
+ find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$DISTNAME
+ popd
+
ORIGPATH="$PATH"
# Extract the release tarball into a dir for each host and build
for i in ${HOSTS}; do
@@ -92,3 +99,6 @@ script: |
mv $DISTNAME $OUTDIR/src
mv ${OUTDIR}/x86_64-* ${OUTDIR}/64
mv ${OUTDIR}/i686-* ${OUTDIR}/32
+
+ # Delete unwanted stuff
+ find ${OUTDIR} -name "lib*.la" -delete
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 5c230e80b1..7ec0700ed3 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -85,6 +85,13 @@ script: |
make dist
DISTNAME=`echo bitcoin-*.tar.gz`
+ # Correct tar file order
+ mkdir -p temp
+ pushd temp
+ tar xf ../$DISTNAME
+ find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$DISTNAME
+ popd
+
ORIGPATH="$PATH"
# Extract the release tarball into a dir for each host and build
for i in ${HOSTS}; do
@@ -102,3 +109,6 @@ script: |
done
mkdir -p $OUTDIR/src
mv $DISTNAME $OUTDIR/src
+
+ # Delete unwanted stuff
+ find ${OUTDIR} -name "lib*.la" -delete
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index cf5436352b..172807467a 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -77,6 +77,13 @@ script: |
make dist
DISTNAME=`echo bitcoin-*.tar.gz`
+ # Correct tar file order
+ mkdir -p temp
+ pushd temp
+ tar xf ../$DISTNAME
+ find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$DISTNAME
+ popd
+
ORIGPATH="$PATH"
# Extract the release tarball into a dir for each host and build
for i in ${HOSTS}; do
@@ -96,3 +103,6 @@ script: |
mv $DISTNAME $OUTDIR/src
mv ${OUTDIR}/x86_64-* ${OUTDIR}/64
mv ${OUTDIR}/i686-* ${OUTDIR}/32
+
+ # Delete unwanted stuff
+ find ${OUTDIR} -name "lib*.la" -delete