Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace all gzip --best calls with pigz -9nm ones. 

Some gzip calls have --no-name, which disables both the original name
and timestamp; use -n (disables original name) and -m (disables original
timestamp) for pigz, for all calls.
This commit is contained in:
Cyril Brulebois 2023-01-23 19:30:39 +01:00
parent 14064e08a1
commit f2a4a832a2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/testingcds
View File

@ -213,7 +213,7 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
mv $OUT/$BASE.iso $ARCHDIR/iso-cd/$NETINSTNAME.iso mv $OUT/$BASE.iso $ARCHDIR/iso-cd/$NETINSTNAME.iso
cat $OUT/$BASE.jigdo | \ cat $OUT/$BASE.jigdo | \
sed 's/-BC-1/-businesscard/g;s/-NETINST-1/-netinst/g' | \ sed 's/-BC-1/-businesscard/g;s/-NETINST-1/-netinst/g' | \
gzip --best --no-name > $ARCHDIR/jigdo-cd/$NETINSTNAME.jigdo pigz -9nm > $ARCHDIR/jigdo-cd/$NETINSTNAME.jigdo
rm $OUT/$BASE.jigdo rm $OUT/$BASE.jigdo
mv $OUT/$BASE.template $ARCHDIR/jigdo-cd/$NETINSTNAME.template mv $OUT/$BASE.template $ARCHDIR/jigdo-cd/$NETINSTNAME.template
# Make sure that the ISO is as new/newer than the jigdo file; #587774 # Make sure that the ISO is as new/newer than the jigdo file; #587774
@ -232,7 +232,7 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
####################################### #######################################
# finish up the jigdos (compress & move them) # finish up the jigdos (compress & move them)
gzip --best --no-name "$OUT"/*.jigdo pigz -9nm "$OUT"/*.jigdo
for i in "$OUT"/*.jigdo.gz; do for i in "$OUT"/*.jigdo.gz; do
mv $i ${i%.gz} mv $i ${i%.gz}
done done

2
tools/Packages-gen
View File

@ -33,4 +33,4 @@ else
fi fi
[ -d $repo ] || mkdir -p $repo [ -d $repo ] || mkdir -p $repo
echo Creating Packages file for $repo... echo Creating Packages file for $repo...
apt-ftparchive packages $repo | gzip >$repo/Packages.gz apt-ftparchive packages $repo | pigz -9nm >$repo/Packages.gz

4
tools/create_control
View File

@ -59,7 +59,7 @@ case $ARCH in
mkdir -p dists/$CODENAME/$SECT/source mkdir -p dists/$CODENAME/$SECT/source
dpkg-scansources pool/$SECT > dists/$CODENAME/$SECT/source/Sources dpkg-scansources pool/$SECT > dists/$CODENAME/$SECT/source/Sources
if [ -f dists/$CODENAME/$SECT/source/Sources ] ; then if [ -f dists/$CODENAME/$SECT/source/Sources ] ; then
gzip --best dists/$CODENAME/$SECT/source/Sources pigz -9nm dists/$CODENAME/$SECT/source/Sources
fi fi
fi fi
done done
@ -86,7 +86,7 @@ case $ARCH in
mkdir -p dists/$CODENAME/$SECT/binary-$ARCH mkdir -p dists/$CODENAME/$SECT/binary-$ARCH
grep-dctrl -FFilename -e "/$SECT/" $PREFIX.Packages | \ grep-dctrl -FFilename -e "/$SECT/" $PREFIX.Packages | \
grep -v ^X-Medium > dists/$CODENAME/$SECT/binary-$ARCH/Packages grep -v ^X-Medium > dists/$CODENAME/$SECT/binary-$ARCH/Packages
gzip --best -c < dists/$CODENAME/$SECT/binary-$ARCH/Packages \ pigz -9nm -c < dists/$CODENAME/$SECT/binary-$ARCH/Packages \
> dists/$CODENAME/$SECT/binary-$ARCH/Packages.gz > dists/$CODENAME/$SECT/binary-$ARCH/Packages.gz
cp $MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release \ cp $MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release \
dists/$CODENAME/$SECT/binary-$ARCH/ dists/$CODENAME/$SECT/binary-$ARCH/