--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package debian-cd 3.1.34 as that's the version currently in use
on cdimage.debian.org to build bullseye images. The changes are straightforward,
trivial, tested and been in unstable since April 20th 2021:
debian-cd (3.1.34) unstable; urgency=medium
.
[ Wolfgang Schweer ]
* data/bullseye: Update Debian Edu installer logo and syslinux splash image
from src:debian-edu-artwork 2.11.5-1.
* tools/boot/*/boot-x86: Prevent custom splash images from being modified.
The related code seems to have been useful a long time ago (the need to use
an RLE file and to reduce the number of colours to 16 has been dropped as
of
syslinux version 3.62). So replace obsolete code with a simple cp command.
* debian/control: Drop Recommends: on netpbm and syslinux-utils. These are no
longer needed now that custom splash images are used unmodified.
.
[ Petter Reinholdtse ]
* Include eatmydata deb for d-i to use offline. Closes: #986772
.
[ Steve McIntyre ]
* Shorten "ppc64el" to "p64el" in the volume ID. The bullseye d-i
RC1 build failed as the volume ID was too long.
$ debdiff debian-cd_3.1.33.dsc debian-cd_3.1.34.dsc | diffstat
debian/changelog | 21 +++++++++++++++++++++
debian/control | 2 +-
easy-build.sh | 1 -
tasks/bullseye/forcd1 | 3 +++
tasks/kali-dev/forcd1 | 3 +++
tasks/kali-last-snapshot/forcd1 | 3 +++
tasks/kali-rolling/forcd1 | 3 +++
tasks/sid/forcd1 | 3 +++
tools/boot/bullseye/boot-x86 | 6 +-----
tools/boot/buster/boot-x86 | 6 +-----
tools/boot/jessie/boot-x86 | 6 +-----
tools/boot/kali-dev/boot-x86 | 6 +-----
tools/boot/kali-last-snapshot/boot-x86 | 6 +-----
tools/boot/kali-rolling/boot-x86 | 6 +-----
tools/boot/sid/boot-x86 | 6 +-----
tools/boot/stretch/boot-x86 | 6 +-----
tools/grab_checksums | 7 +++++--
tools/start_new_disc | 2 ++
18 files changed, 52 insertions(+), 44 deletions(-)
The full debdiff is attached.
unblock debian-cd/3.1.34
Thanks for your work on releasing bullseye!
--
cheers,
Holger
⢀⣴⠾⠻⢶⣦⠀
⣾⠁⢠⠒⠀⣿⡁ holger@(debian|reproducible-builds|layer-acht).org
⢿⡄⠘⠷⠚⠋⠀ OpenPGP: B8BF54137B09D35CF026FE9D 091AB856069AAA1C
⠈⠳⣄
„If you don't like vaccination, try the disease.“ (Herwig Kollaritsch)
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/bullseye/debian-edu-installer-logo.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/bullseye/debian-edu-installer-logo.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/bullseye/splash-skolelinux.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/bullseye/splash-skolelinux.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/kali-dev/debian-edu-installer-logo.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/kali-dev/debian-edu-installer-logo.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/kali-dev/splash-skolelinux.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/kali-dev/splash-skolelinux.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/kali-last-snapshot/debian-edu-installer-logo.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/kali-last-snapshot/debian-edu-installer-logo.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/kali-last-snapshot/splash-skolelinux.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/kali-last-snapshot/splash-skolelinux.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/kali-rolling/debian-edu-installer-logo.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/kali-rolling/debian-edu-installer-logo.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/kali-rolling/splash-skolelinux.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/kali-rolling/splash-skolelinux.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/sid/debian-edu-installer-logo.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/sid/debian-edu-installer-logo.png sind verschieden.
Binärdateien /tmp/BwGYN4Islp/debian-cd-3.1.33/data/sid/splash-skolelinux.png und /tmp/XYwrMwcv7v/debian-cd-3.1.34/data/sid/splash-skolelinux.png sind verschieden.
diff -Nru debian-cd-3.1.33/debian/changelog debian-cd-3.1.34/debian/changelog
--- debian-cd-3.1.33/debian/changelog 2021-02-03 19:45:22.000000000 +0100
+++ debian-cd-3.1.34/debian/changelog 2021-04-20 01:03:35.000000000 +0200
@@ -1,3 +1,24 @@
+debian-cd (3.1.34) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * data/bullseye: Update Debian Edu installer logo and syslinux splash image
+ from src:debian-edu-artwork 2.11.5-1.
+ * tools/boot/*/boot-x86: Prevent custom splash images from being modified.
+ The related code seems to have been useful a long time ago (the need to use
+ an RLE file and to reduce the number of colours to 16 has been dropped as of
+ syslinux version 3.62). So replace obsolete code with a simple cp command.
+ * debian/control: Drop Recommends: on netpbm and syslinux-utils. These are no
+ longer needed now that custom splash images are used unmodified.
+
+ [ Petter Reinholdtse ]
+ * Include eatmydata deb for d-i to use offline. Closes: #986772
+
+ [ Steve McIntyre ]
+ * Shorten "ppc64el" to "p64el" in the volume ID. The bullseye d-i
+ RC1 build failed as the volume ID was too long.
+
+ -- Holger Levsen <hol...@debian.org> Tue, 20 Apr 2021 01:03:35 +0200
+
debian-cd (3.1.33) unstable; urgency=medium
[ Wolfgang Schweer ]
diff -Nru debian-cd-3.1.33/debian/control debian-cd-3.1.34/debian/control
--- debian-cd-3.1.33/debian/control 2021-01-19 14:56:03.000000000 +0100
+++ debian-cd-3.1.34/debian/control 2021-03-22 15:20:37.000000000 +0100
@@ -16,7 +16,7 @@
Package: debian-cd
Architecture: all
Depends: ${misc:Depends}, curl, perl, dpkg-dev, cpp, libdigest-md5-perl, libdigest-sha-perl, tofrodos, apt, make, xorriso | genisoimage, lynx, grep-dctrl, bc, libcompress-zlib-perl, bzip2, libdpkg-perl, wget
-Recommends: hfsutils, netpbm, isolinux, syslinux-common, syslinux-utils, mtools, dosfstools
+Recommends: hfsutils, isolinux, syslinux-common, mtools, dosfstools
Description: Tools for building (Official) Debian CD set
Debian-cd is the official tool for building Debian CD set since the potato
release. It was formerly called YACS (for Yet Another CD Script).
diff -Nru debian-cd-3.1.33/easy-build.sh debian-cd-3.1.34/easy-build.sh
--- debian-cd-3.1.33/easy-build.sh 2018-07-29 05:22:33.000000000 +0200
+++ debian-cd-3.1.34/easy-build.sh 2021-03-22 15:20:37.000000000 +0100
@@ -18,7 +18,6 @@
export CF=./CONF.sh
. $CF
export DEBIAN_CD_CONF_SOURCED=true
-unset UPDATE_LOCAL
## Parse the parameters passed to the script
diff -Nru debian-cd-3.1.33/tasks/bullseye/forcd1 debian-cd-3.1.34/tasks/bullseye/forcd1
--- debian-cd-3.1.33/tasks/bullseye/forcd1 2019-07-07 17:52:46.000000000 +0200
+++ debian-cd-3.1.34/tasks/bullseye/forcd1 2021-04-14 10:45:37.000000000 +0200
@@ -23,3 +23,6 @@
/* #861288 - make it easier for users to report installation problems */
reportbug
+/* ensure eatmydata-udeb can speed up offline installs too */
+eatmydata
+libeatmydata1
diff -Nru debian-cd-3.1.33/tasks/kali-dev/forcd1 debian-cd-3.1.34/tasks/kali-dev/forcd1
--- debian-cd-3.1.33/tasks/kali-dev/forcd1 2019-07-07 17:52:46.000000000 +0200
+++ debian-cd-3.1.34/tasks/kali-dev/forcd1 2021-04-14 10:45:37.000000000 +0200
@@ -23,3 +23,6 @@
/* #861288 - make it easier for users to report installation problems */
reportbug
+/* ensure eatmydata-udeb can speed up offline installs too */
+eatmydata
+libeatmydata1
diff -Nru debian-cd-3.1.33/tasks/kali-last-snapshot/forcd1 debian-cd-3.1.34/tasks/kali-last-snapshot/forcd1
--- debian-cd-3.1.33/tasks/kali-last-snapshot/forcd1 2019-07-07 17:52:46.000000000 +0200
+++ debian-cd-3.1.34/tasks/kali-last-snapshot/forcd1 2021-04-14 10:45:37.000000000 +0200
@@ -23,3 +23,6 @@
/* #861288 - make it easier for users to report installation problems */
reportbug
+/* ensure eatmydata-udeb can speed up offline installs too */
+eatmydata
+libeatmydata1
diff -Nru debian-cd-3.1.33/tasks/kali-rolling/forcd1 debian-cd-3.1.34/tasks/kali-rolling/forcd1
--- debian-cd-3.1.33/tasks/kali-rolling/forcd1 2019-07-07 17:52:46.000000000 +0200
+++ debian-cd-3.1.34/tasks/kali-rolling/forcd1 2021-04-14 10:45:37.000000000 +0200
@@ -23,3 +23,6 @@
/* #861288 - make it easier for users to report installation problems */
reportbug
+/* ensure eatmydata-udeb can speed up offline installs too */
+eatmydata
+libeatmydata1
diff -Nru debian-cd-3.1.33/tasks/sid/forcd1 debian-cd-3.1.34/tasks/sid/forcd1
--- debian-cd-3.1.33/tasks/sid/forcd1 2019-07-07 17:52:46.000000000 +0200
+++ debian-cd-3.1.34/tasks/sid/forcd1 2021-04-14 10:45:37.000000000 +0200
@@ -23,3 +23,6 @@
/* #861288 - make it easier for users to report installation problems */
reportbug
+/* ensure eatmydata-udeb can speed up offline installs too */
+eatmydata
+libeatmydata1
diff -Nru debian-cd-3.1.33/tools/boot/bullseye/boot-x86 debian-cd-3.1.34/tools/boot/bullseye/boot-x86
--- debian-cd-3.1.33/tools/boot/bullseye/boot-x86 2020-05-26 15:32:38.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/bullseye/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -380,11 +380,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/boot/buster/boot-x86 debian-cd-3.1.34/tools/boot/buster/boot-x86
--- debian-cd-3.1.33/tools/boot/buster/boot-x86 2019-07-07 17:52:46.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/buster/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -406,11 +406,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/boot/jessie/boot-x86 debian-cd-3.1.34/tools/boot/jessie/boot-x86
--- debian-cd-3.1.33/tools/boot/jessie/boot-x86 2018-07-29 05:22:33.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/jessie/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -387,11 +387,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/boot/kali-dev/boot-x86 debian-cd-3.1.34/tools/boot/kali-dev/boot-x86
--- debian-cd-3.1.33/tools/boot/kali-dev/boot-x86 2020-05-26 15:32:38.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/kali-dev/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -380,11 +380,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/boot/kali-last-snapshot/boot-x86 debian-cd-3.1.34/tools/boot/kali-last-snapshot/boot-x86
--- debian-cd-3.1.33/tools/boot/kali-last-snapshot/boot-x86 2020-05-26 15:32:38.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/kali-last-snapshot/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -380,11 +380,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/boot/kali-rolling/boot-x86 debian-cd-3.1.34/tools/boot/kali-rolling/boot-x86
--- debian-cd-3.1.33/tools/boot/kali-rolling/boot-x86 2020-05-26 15:32:38.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/kali-rolling/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -380,11 +380,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/boot/sid/boot-x86 debian-cd-3.1.34/tools/boot/sid/boot-x86
--- debian-cd-3.1.33/tools/boot/sid/boot-x86 2020-05-26 15:32:38.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/sid/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -380,11 +380,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/boot/stretch/boot-x86 debian-cd-3.1.34/tools/boot/stretch/boot-x86
--- debian-cd-3.1.33/tools/boot/stretch/boot-x86 2018-07-29 05:22:33.000000000 +0200
+++ debian-cd-3.1.34/tools/boot/stretch/boot-x86 2021-03-22 15:20:37.000000000 +0100
@@ -404,11 +404,7 @@
fi
if [ "$SPLASHPNG" ] ; then
- # Insert our own splash screen. Color index 0 is background, and
- # index 7 is foreground. Set to black and white respecively
- pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
- pngtopnm < $SPLASHPNG | ppmquant 16 | pnmtopng > boot$N/isolinux/splash.png
+ cp $SPLASHPNG boot$N/isolinux/splash.png
fi
# used by Debian Edu
diff -Nru debian-cd-3.1.33/tools/grab_checksums debian-cd-3.1.34/tools/grab_checksums
--- debian-cd-3.1.33/tools/grab_checksums 2019-12-12 12:22:25.000000000 +0100
+++ debian-cd-3.1.34/tools/grab_checksums 2021-03-22 15:20:37.000000000 +0100
@@ -36,6 +36,9 @@
if [ "$BACKPORTS"x != ""x ] ; then
LOCATIONS="$LOCATIONS $MIRROR/dists/$CODENAME-backports/"
fi
+ if [ "$UNRELEASED" = 1 ] ; then
+ LOCATIONS="$LOCATIONS $MIRROR/dists/unreleased/"
+ fi
echo "Looking in $LOCATIONS"
for LOCATION in $LOCATIONS; do
@@ -47,7 +50,7 @@
case $ARCH in
source)
- FILES=`find $LOCATIONS -name Sources.gz -o -name Sources.xz`
+ FILES=`find $LOCATIONS -follow -name Sources.gz -o -name Sources.xz`
echo "Using $CHECKSUM sums from Sources files:"
echo $FILES
$BASEDIR/tools/catz $FILES | \
@@ -82,7 +85,7 @@
}' | sort | uniq >> $OUT
;;
*)
- FILES=`find $LOCATIONS -name Packages.gz \
+ FILES=`find $LOCATIONS -follow -name Packages.gz \
-o -name Packages.xz | grep binary-$ARCH`
echo "Using $CHECKSUM sums from Packages files:"
echo $FILES
diff -Nru debian-cd-3.1.33/tools/start_new_disc debian-cd-3.1.34/tools/start_new_disc
--- debian-cd-3.1.33/tools/start_new_disc 2021-02-03 17:24:11.000000000 +0100
+++ debian-cd-3.1.34/tools/start_new_disc 2021-04-19 14:30:56.000000000 +0200
@@ -69,6 +69,8 @@
export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE${FIRMWARE_TEXT} $BUILD_DATE"
fi
case "$ARCHES" in
+ ppc64el)
+ export VOLID="$VOLID_BASE p64el $DISKNUMSTRING" ;;
powerpc)
export VOLID="$VOLID_BASE ppc $DISKNUMSTRING" ;;
mips64el)
signature.asc
Description: PGP signature
--- End Message ---
