Skip to content

Commit a992d60

Browse files
committed
Merge pull request #5536
566c6cb gitian: attempt to fix tarball determinisim (Cory Fields)
2 parents 3c9daa2 + 566c6cb commit a992d60

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ script: |
7979
mkdir -p temp
8080
pushd temp
8181
tar xf ../$SOURCEDIST
82-
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$SOURCEDIST
82+
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
8383
popd
8484
8585
ORIGPATH="$PATH"
@@ -99,7 +99,7 @@ script: |
9999
find . -name "lib*.la" -delete
100100
find . -name "lib*.a" -delete
101101
rm -rf ${DISTNAME}/lib/pkgconfig
102-
find . | sort | tar --no-recursion -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
102+
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
103103
cd ../../
104104
done
105105
mkdir -p $OUTDIR/src

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ script: |
9090
mkdir -p temp
9191
pushd temp
9292
tar xf ../$SOURCEDIST
93-
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$SOURCEDIST
93+
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
9494
popd
9595
9696
ORIGPATH="$PATH"
@@ -116,7 +116,7 @@ script: |
116116
cp ${BASEPREFIX}/${i}/native/bin/${i}-pagestuff unsigned-app-${i}/pagestuff
117117
mv dist unsigned-app-${i}
118118
pushd unsigned-app-${i}
119-
find . | sort | tar --no-recursion -czf ${OUTDIR}/${DISTNAME}-osx-unsigned.tar.gz -T -
119+
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-osx-unsigned.tar.gz
120120
popd
121121
122122
make deploy
@@ -126,7 +126,7 @@ script: |
126126
find . -name "lib*.la" -delete
127127
find . -name "lib*.a" -delete
128128
rm -rf ${DISTNAME}/lib/pkgconfig
129-
find . | sort | tar --no-recursion -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
129+
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
130130
cd ../../
131131
done
132132
mkdir -p $OUTDIR/src

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ script: |
8383
mkdir -p temp
8484
pushd temp
8585
tar xf ../$SOURCEDIST
86-
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$SOURCEDIST
86+
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
8787
popd
8888
8989
ORIGPATH="$PATH"

0 commit comments

Comments
 (0)