Skip to content

Commit af05f36

Browse files
committed
Merge #16141: build: remove GZIP export from gitian descriptors
bc8863b depends: remove usage of TAR_OPTIONS (fanquake) 3ff1f2a build: remove export GZIP from gitian descriptors (fanquake) Pull request description: The `GZIP` environment variable is [deprecated](https://www.gnu.org/software/gzip/manual/gzip.html#Environment), and everywhere that we invoke `gzip` we are already passing `-9n` directly, i.e: ```base find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST ``` ```bash GZIP="-9n" gzip -h gzip: warning: GZIP environment variable is deprecated; use an alias or script Usage: gzip [OPTION]... [FILE]... ``` ACKs for commit bc8863: Tree-SHA512: 2d5277f7bf096fd5bd0dda47dfaf2dc7a31cc5d91eb8cb42db9cbe060d07dff66bf8e1122a89a3a1b597a3b39dbf8d9a8da4f02e642f58e451ce9fb24cc59769
2 parents d0f81a9 + bc8863b commit af05f36

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ script: |
5050
5151
export QT_RCC_TEST=1
5252
export QT_RCC_SOURCE_DATE_OVERRIDE=1
53-
export GZIP="-9n"
54-
export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
5553
export TZ="UTC"
5654
export BUILD_DIR=`pwd`
5755
mkdir -p ${WRAP_DIR}
@@ -150,8 +148,8 @@ script: |
150148
# Correct tar file order
151149
mkdir -p temp
152150
pushd temp
153-
tar xf ../$SOURCEDIST
154-
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
151+
tar -xf ../$SOURCEDIST
152+
find bitcoin-* | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
155153
popd
156154
157155
# Workaround for tarball not building with the bare tag version (prep)
@@ -184,8 +182,8 @@ script: |
184182
find ${DISTNAME}/bin -type f -executable -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
185183
find ${DISTNAME}/lib -type f -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
186184
cp ../doc/README.md ${DISTNAME}/
187-
find ${DISTNAME} -not -name "*.dbg" | 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
188-
find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
185+
find ${DISTNAME} -not -name "*.dbg" | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
186+
find ${DISTNAME} -name "*.dbg" | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
189187
cd ../../
190188
rm -rf distsrc-${i}
191189
done

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ script: |
4444
4545
export QT_RCC_TEST=1
4646
export QT_RCC_SOURCE_DATE_OVERRIDE=1
47-
export GZIP="-9n"
48-
export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
4947
export TZ="UTC"
5048
export BUILD_DIR=`pwd`
5149
mkdir -p ${WRAP_DIR}
@@ -114,8 +112,8 @@ script: |
114112
# Correct tar file order
115113
mkdir -p temp
116114
pushd temp
117-
tar xf ../$SOURCEDIST
118-
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
115+
tar -xf ../$SOURCEDIST
116+
find bitcoin-* | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
119117
popd
120118
121119
# Workaround for tarball not building with the bare tag version (prep)
@@ -152,7 +150,7 @@ script: |
152150
cp ${BASEPREFIX}/${i}/native/bin/${i}-pagestuff unsigned-app-${i}/pagestuff
153151
mv dist unsigned-app-${i}
154152
pushd unsigned-app-${i}
155-
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
153+
find . | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-osx-unsigned.tar.gz
156154
popd
157155
158156
make deploy
@@ -162,7 +160,7 @@ script: |
162160
find . -name "lib*.la" -delete
163161
find . -name "lib*.a" -delete
164162
rm -rf ${DISTNAME}/lib/pkgconfig
165-
find ${DISTNAME} | 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
163+
find ${DISTNAME} | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
166164
cd ../../
167165
done
168166
mkdir -p $OUTDIR/src

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ script: |
4040
4141
export QT_RCC_TEST=1
4242
export QT_RCC_SOURCE_DATE_OVERRIDE=1
43-
export GZIP="-9n"
44-
export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
4543
export TZ="UTC"
4644
export BUILD_DIR=`pwd`
4745
mkdir -p ${WRAP_DIR}
@@ -130,8 +128,8 @@ script: |
130128
# Correct tar file order
131129
mkdir -p temp
132130
pushd temp
133-
tar xf ../$SOURCEDIST
134-
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
131+
tar -xf ../$SOURCEDIST
132+
find bitcoin-* | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
135133
mkdir -p $OUTDIR/src
136134
cp ../$SOURCEDIST $OUTDIR/src
137135
popd
@@ -177,6 +175,6 @@ script: |
177175
cd $BUILD_DIR/windeploy
178176
mkdir unsigned
179177
cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/
180-
find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
178+
find . | sort | tar --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
181179
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
182180
mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip

0 commit comments

Comments
 (0)