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 -9 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:35 +01:00
parent de66d9f692
commit 14064e08a1
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mklist
View File

@ -14,7 +14,7 @@ for FILE in $@; do
isoinfo -fR -i $FILE | perl -e ' isoinfo -fR -i $FILE | perl -e '
while (<>) { while (<>) {
chomp;m,^/pool/[^/]+/[^/]+/[^/]+/(.*), and print "$1\n"; chomp;m,^/pool/[^/]+/[^/]+/[^/]+/(.*), and print "$1\n";
}' | sort | gzip -9 > $LISTFILE }' | sort | pigz -9nm > $LISTFILE
mv $LISTFILE $LISTDIR mv $LISTFILE $LISTDIR
fi fi
done done

2
tools/boot/bookworm/boot-x86
View File

@ -380,7 +380,7 @@ if [ "$LOGOPNG" ] ; then
cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png
echo usr/share/graphics/logo_debian.png | \ echo usr/share/graphics/logo_debian.png | \
cpio -oA -H newc -F $GTKINITRD cpio -oA -H newc -F $GTKINITRD
gzip -9 $GTKINITRD pigz -9nm $GTKINITRD
) )
rm -rf $INITRDDIR rm -rf $INITRDDIR
fi fi

2
tools/boot/bookworm/common.sh
View File

@ -241,7 +241,7 @@ install_firmwares_initrd () {
dpkg -x "${MIRROR}/${FILE}" ${FWDIR} dpkg -x "${MIRROR}/${FILE}" ${FWDIR}
done done
(cd ${FWDIR} ; find lib/firmware | cpio -oA -H newc -F $initrd) (cd ${FWDIR} ; find lib/firmware | cpio -oA -H newc -F $initrd)
gzip -9 $initrd pigz -9nm $initrd
rm -fr $FWDIR rm -fr $FWDIR
else else
echo " WARNING: Could not find firmware package(s) matching $regex" echo " WARNING: Could not find firmware package(s) matching $regex"

2
tools/boot/bullseye/boot-x86
View File

@ -402,7 +402,7 @@ if [ "$LOGOPNG" ] ; then
cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png
echo usr/share/graphics/logo_debian.png | \ echo usr/share/graphics/logo_debian.png | \
cpio -oA -H newc -F $GTKINITRD cpio -oA -H newc -F $GTKINITRD
gzip -9 $GTKINITRD pigz -9nm $GTKINITRD
) )
rm -rf $INITRDDIR rm -rf $INITRDDIR
fi fi

2
tools/boot/buster/boot-x86
View File

@ -428,7 +428,7 @@ if [ "$LOGOPNG" ] ; then
cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png
echo usr/share/graphics/logo_debian.png | \ echo usr/share/graphics/logo_debian.png | \
cpio -oA -H newc -F $GTKINITRD cpio -oA -H newc -F $GTKINITRD
gzip -9 $GTKINITRD pigz -9nm $GTKINITRD
) )
rm -rf $INITRDDIR rm -rf $INITRDDIR
fi fi

2
tools/boot/jessie/boot-x86
View File

@ -406,7 +406,7 @@ if [ "$LOGOPNG" ] ; then
cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png
echo usr/share/graphics/logo_debian.png | \ echo usr/share/graphics/logo_debian.png | \
cpio -oA -H newc -F $GTKINITRD cpio -oA -H newc -F $GTKINITRD
gzip -9 $GTKINITRD pigz -9nm $GTKINITRD
) )
rm -rf $INITRDDIR rm -rf $INITRDDIR
fi fi

2
tools/boot/stretch/boot-x86
View File

@ -426,7 +426,7 @@ if [ "$LOGOPNG" ] ; then
cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png cp $LOGOPNG $INITRDDIR/usr/share/graphics/logo_debian.png
echo usr/share/graphics/logo_debian.png | \ echo usr/share/graphics/logo_debian.png | \
cpio -oA -H newc -F $GTKINITRD cpio -oA -H newc -F $GTKINITRD
gzip -9 $GTKINITRD pigz -9nm $GTKINITRD
) )
rm -rf $INITRDDIR rm -rf $INITRDDIR
fi fi

2
tools/make-firmware-image
View File

@ -39,7 +39,7 @@ cd $TMPDIR/firmware
tar czf ../firmware.tar.gz . tar czf ../firmware.tar.gz .
zip -9rq ../firmware.zip . zip -9rq ../firmware.zip .
cd .. cd ..
find firmware | cpio --quiet -o -H newc | gzip -9 > firmware.cpio.gz find firmware | cpio --quiet -o -H newc | pigz -9nm > firmware.cpio.gz
ls -l $PWD/firmware.cpio.gz $PWD/firmware.tar.gz $PWD/firmware.zip ls -l $PWD/firmware.cpio.gz $PWD/firmware.tar.gz $PWD/firmware.zip
sha256sum firmware.* > SHA256SUMS sha256sum firmware.* > SHA256SUMS

4
tools/make_disc_trees.pl
View File

@ -662,13 +662,13 @@ sub recompress {
# Packages and Sources files; workaround for bug #402482 # Packages and Sources files; workaround for bug #402482
if ($filename =~ m/\/.*\/(Packages|Sources)$/o) { if ($filename =~ m/\/.*\/(Packages|Sources)$/o) {
system("rm -f $_.gz"); system("rm -f $_.gz");
system("gzip --no-name -9c < $_ >$_.gz"); system("pigz -9nmc < $_ >$_.gz");
} }
# Translation files need to be compressed in .gz format on CD? # Translation files need to be compressed in .gz format on CD?
if ($filename =~ m/\/.*\/i18n\/(Translation.*)$/o && if ($filename =~ m/\/.*\/i18n\/(Translation.*)$/o &&
! ($filename =~ m/\/.*\/i18n\/(Translation.*gz)$/o)) { ! ($filename =~ m/\/.*\/i18n\/(Translation.*gz)$/o)) {
system("rm -f $_.gz"); system("rm -f $_.gz");
system("gzip --no-name -9c < $_ >$_.gz"); system("pigz -9nmc < $_ >$_.gz");
system("rm -f $_"); system("rm -f $_");
} }
} }

2
tools/make_image
View File

@ -151,7 +151,7 @@ do
fi fi
# Generate our listfile while we have the information to hand easily # Generate our listfile while we have the information to hand easily
find CD$n/pool -type f | sed 's?^.*/??g' | gzip -9 > $OUT/$OUTFILE.list.gz find CD$n/pool -type f | sed 's?^.*/??g' | pigz -9nm > $OUT/$OUTFILE.list.gz
fi fi
# If we've made jigdo files, tweak them with extra info now # If we've made jigdo files, tweak them with extra info now

4
update-cd
View File

@ -183,7 +183,7 @@ make_cd () {
echo $SNAPSHOT >> ${JIGDODIR}/${BASENAME}.jigdo echo $SNAPSHOT >> ${JIGDODIR}/${BASENAME}.jigdo
# Make sure we compres the jigdo file *before* we checksum it # Make sure we compres the jigdo file *before* we checksum it
gzip -9 ${JIGDODIR}/${BASENAME}.jigdo pigz -9nm ${JIGDODIR}/${BASENAME}.jigdo
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
for SHA_SIZE in 256 512; do for SHA_SIZE in 256 512; do
@ -215,7 +215,7 @@ make_cd () {
fi fi
set -e set -e
fi fi
find $UPD/CD$CDNUM/pool -type f | sed 's?^.*/??g' | gzip -9 > ${LISTDIR}/${BASENAME}.list.gz find $UPD/CD$CDNUM/pool -type f | sed 's?^.*/??g' | pigz -9nm > ${LISTDIR}/${BASENAME}.list.gz
} }
add_file () { add_file () {