Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-cd@lists.debian.org
Hi,
[ Reason ]
[ Impact ]
While not absolutely needed to have in bookworm, it looks like a good
idea to ship the tooling that's making the release possible.
[ Tests ]
We appear to have built D-I Bookworm RC 1 with the proposed changes
minus the last one (zstd), and D-I Bookworm RC 2 with the proposed
changes, and I think it worked OK! :)
[ Risks ]
We're mostly removing references to old tools, and pulling an extra
package on installation images (that was being pulled later on during
the installation process so that's not a huge change anyway).
The remaining one (symlinks vs. hardlinks) could have been worrying. The
aim is to support people doing weird things with the images we produce,
and it could possibly regress for people who don't. Needless to say,
firmware support is getting extensively tested with various machines,
including laptops pulling up to 5 firmware packages, and there were no
regressions spotted there.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
Thanks for all your hard work.
unblock debian-cd/3.2.1
Cheers,
--
Cyril Brulebois (k...@debian.org) <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant
diff -Nru debian-cd-3.2.0/debian/changelog debian-cd-3.2.1/debian/changelog
--- debian-cd-3.2.0/debian/changelog 2023-02-24 17:04:14.000000000 +0100
+++ debian-cd-3.2.1/debian/changelog 2023-04-30 18:11:17.000000000 +0200
@@ -1,3 +1,20 @@
+debian-cd (3.2.1) unstable; urgency=medium
+
+ [ James Addison ]
+ * firmware: use hard links rather than symlinks. Closes: #1031696
+
+ [ Steve McIntyre ]
+ * Kill loadlin, nobody has DOS any more. Also Stop copying the
+ /tools directory from the mirror, as that's all that's left there
+ now.
+
+ [ Cyril Brulebois ]
+ * tools/generate_di+k_list: Add zstd alongside initramfs-tools and
+ busybox, since it's now getting installed by base-installer (starting
+ with 1.212).
+
+ -- Cyril Brulebois <k...@debian.org> Sun, 30 Apr 2023 18:11:17 +0200
+
debian-cd (3.2.0) unstable; urgency=medium
[ Cyril Brulebois — high-level summary ]
diff -Nru debian-cd-3.2.0/docs/makefile.html debian-cd-3.2.1/docs/makefile.html
--- debian-cd-3.2.0/docs/makefile.html 2021-04-23 04:39:28.000000000 +0200
+++ debian-cd-3.2.1/docs/makefile.html 2023-04-01 00:15:03.000000000 +0200
@@ -38,10 +38,6 @@
<h3><code>ok:</code></h3>
<p>Simple sanity checking.</p>
-<h3><code>$(MIRROR)/doc:</code>, <code>$(MIRROR)/tools:</code> and
-<code>need-complete-mirror</code></h3>
-<p>Ensure that we have all the needed pieces of the archive.</p>
-
<h2>General initialisation and cleanup</h2>
<h3><code>init:</code></h3>
diff -Nru debian-cd-3.2.0/tools/boot/bookworm/boot-x86
debian-cd-3.2.1/tools/boot/bookworm/boot-x86
--- debian-cd-3.2.0/tools/boot/bookworm/boot-x86 2023-02-24
17:01:54.000000000 +0100
+++ debian-cd-3.2.1/tools/boot/bookworm/boot-x86 2023-04-01
00:15:03.000000000 +0200
@@ -157,15 +157,6 @@
cp -lf $disk $CDDIR/$INSTALLDIR/$dir
fi
done
-
- if [ -e "$MIRROR/tools" ] && \
- [ ! -e $CDDIR/tools ] && \
- [ "$OMIT_DOC_TOOLS" != "1" ] ; then
- echo " Adding tools to CD1"
- $BASEDIR/tools/add_files $CDDIR $MIRROR tools
- # Remove the win32-loader/ subdirectory from tools, as d-i
already installs setup.exe
- rm -Rf $CDDIR/tools/win32-loader
- fi
fi
case "$DESKTOP" in
@@ -187,9 +178,6 @@
mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
-if [ -e $CDDIR/tools/loadlin.exe ]; then
- echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos >
$CDDIR/$INSTALLDIR/install.bat
-fi
# In case of a multi-arch CD the script will be called two times. The
# first time the isolinux dir gets set up for single arch; if it is
diff -Nru debian-cd-3.2.0/tools/boot/kali-dev/boot-x86
debian-cd-3.2.1/tools/boot/kali-dev/boot-x86
--- debian-cd-3.2.0/tools/boot/kali-dev/boot-x86 2023-02-24
17:01:54.000000000 +0100
+++ debian-cd-3.2.1/tools/boot/kali-dev/boot-x86 2023-04-01
00:15:03.000000000 +0200
@@ -157,15 +157,6 @@
cp -lf $disk $CDDIR/$INSTALLDIR/$dir
fi
done
-
- if [ -e "$MIRROR/tools" ] && \
- [ ! -e $CDDIR/tools ] && \
- [ "$OMIT_DOC_TOOLS" != "1" ] ; then
- echo " Adding tools to CD1"
- $BASEDIR/tools/add_files $CDDIR $MIRROR tools
- # Remove the win32-loader/ subdirectory from tools, as d-i
already installs setup.exe
- rm -Rf $CDDIR/tools/win32-loader
- fi
fi
case "$DESKTOP" in
@@ -187,9 +178,6 @@
mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
-if [ -e $CDDIR/tools/loadlin.exe ]; then
- echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos >
$CDDIR/$INSTALLDIR/install.bat
-fi
# In case of a multi-arch CD the script will be called two times. The
# first time the isolinux dir gets set up for single arch; if it is
diff -Nru debian-cd-3.2.0/tools/boot/kali-last-snapshot/boot-x86
debian-cd-3.2.1/tools/boot/kali-last-snapshot/boot-x86
--- debian-cd-3.2.0/tools/boot/kali-last-snapshot/boot-x86 2023-02-24
17:01:54.000000000 +0100
+++ debian-cd-3.2.1/tools/boot/kali-last-snapshot/boot-x86 2023-04-01
00:15:03.000000000 +0200
@@ -157,15 +157,6 @@
cp -lf $disk $CDDIR/$INSTALLDIR/$dir
fi
done
-
- if [ -e "$MIRROR/tools" ] && \
- [ ! -e $CDDIR/tools ] && \
- [ "$OMIT_DOC_TOOLS" != "1" ] ; then
- echo " Adding tools to CD1"
- $BASEDIR/tools/add_files $CDDIR $MIRROR tools
- # Remove the win32-loader/ subdirectory from tools, as d-i
already installs setup.exe
- rm -Rf $CDDIR/tools/win32-loader
- fi
fi
case "$DESKTOP" in
@@ -187,9 +178,6 @@
mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
-if [ -e $CDDIR/tools/loadlin.exe ]; then
- echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos >
$CDDIR/$INSTALLDIR/install.bat
-fi
# In case of a multi-arch CD the script will be called two times. The
# first time the isolinux dir gets set up for single arch; if it is
diff -Nru debian-cd-3.2.0/tools/boot/kali-rolling/boot-x86
debian-cd-3.2.1/tools/boot/kali-rolling/boot-x86
--- debian-cd-3.2.0/tools/boot/kali-rolling/boot-x86 2023-02-24
17:01:54.000000000 +0100
+++ debian-cd-3.2.1/tools/boot/kali-rolling/boot-x86 2023-04-01
00:15:03.000000000 +0200
@@ -157,15 +157,6 @@
cp -lf $disk $CDDIR/$INSTALLDIR/$dir
fi
done
-
- if [ -e "$MIRROR/tools" ] && \
- [ ! -e $CDDIR/tools ] && \
- [ "$OMIT_DOC_TOOLS" != "1" ] ; then
- echo " Adding tools to CD1"
- $BASEDIR/tools/add_files $CDDIR $MIRROR tools
- # Remove the win32-loader/ subdirectory from tools, as d-i
already installs setup.exe
- rm -Rf $CDDIR/tools/win32-loader
- fi
fi
case "$DESKTOP" in
@@ -187,9 +178,6 @@
mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
-if [ -e $CDDIR/tools/loadlin.exe ]; then
- echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos >
$CDDIR/$INSTALLDIR/install.bat
-fi
# In case of a multi-arch CD the script will be called two times. The
# first time the isolinux dir gets set up for single arch; if it is
diff -Nru debian-cd-3.2.0/tools/boot/sid/boot-x86
debian-cd-3.2.1/tools/boot/sid/boot-x86
--- debian-cd-3.2.0/tools/boot/sid/boot-x86 2023-02-24 17:01:54.000000000
+0100
+++ debian-cd-3.2.1/tools/boot/sid/boot-x86 2023-04-01 00:15:03.000000000
+0200
@@ -157,15 +157,6 @@
cp -lf $disk $CDDIR/$INSTALLDIR/$dir
fi
done
-
- if [ -e "$MIRROR/tools" ] && \
- [ ! -e $CDDIR/tools ] && \
- [ "$OMIT_DOC_TOOLS" != "1" ] ; then
- echo " Adding tools to CD1"
- $BASEDIR/tools/add_files $CDDIR $MIRROR tools
- # Remove the win32-loader/ subdirectory from tools, as d-i
already installs setup.exe
- rm -Rf $CDDIR/tools/win32-loader
- fi
fi
case "$DESKTOP" in
@@ -187,9 +178,6 @@
mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
-if [ -e $CDDIR/tools/loadlin.exe ]; then
- echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos >
$CDDIR/$INSTALLDIR/install.bat
-fi
# In case of a multi-arch CD the script will be called two times. The
# first time the isolinux dir gets set up for single arch; if it is
diff -Nru debian-cd-3.2.0/tools/generate_di+k_list
debian-cd-3.2.1/tools/generate_di+k_list
--- debian-cd-3.2.0/tools/generate_di+k_list 2023-02-24 17:01:54.000000000
+0100
+++ debian-cd-3.2.1/tools/generate_di+k_list 2023-04-27 18:27:58.000000000
+0200
@@ -121,6 +121,7 @@
iucode-tool
initramfs-tools
busybox
+zstd
grub-pc
grub-efi
grub-efi-ia32
@@ -157,6 +158,7 @@
iucode-tool
initramfs-tools
busybox
+zstd
grub-pc
grub-efi
grub-efi-amd64
@@ -174,6 +176,7 @@
#ifdef ARCH_ia64
initramfs-tools
busybox
+zstd
grub-efi
grub-efi-ia64
grub-efi-ia64-bin
@@ -212,6 +215,7 @@
#ifdef ARCH_armel
initramfs-tools
busybox
+zstd
slugimage
flash-kernel
nslu2-utils
@@ -227,6 +231,7 @@
#ifdef ARCH_armhf
initramfs-tools
busybox
+zstd
flash-kernel
linux-image-armmp
linux-image-armmp-lpae
@@ -238,6 +243,7 @@
#ifdef ARCH_arm64
initramfs-tools
busybox
+zstd
flash-kernel
linux-image-arm64
grub-efi
@@ -251,6 +257,7 @@
initramfs-tools
grub-ieee1275
busybox
+zstd
libc6-sparcv9b
libc6-sparcv9
linux-image-sparc32
@@ -263,6 +270,7 @@
initramfs-tools
grub-ieee1275
busybox
+zstd
linux-image-sparc64
linux-image-sparc64-smp
#endif
@@ -270,6 +278,7 @@
#ifdef ARCH_m68k
initramfs-tools
busybox
+zstd
linux-image-m68k
#endif
@@ -277,6 +286,7 @@
initramfs-tools
grub-ieee1275
busybox
+zstd
laptop-detect
quik
powerpc-utils
@@ -292,6 +302,7 @@
initramfs-tools
grub-ieee1275
busybox
+zstd
hfsutils
powerpc-utils
powerpc-ibm-utils
@@ -302,6 +313,7 @@
initramfs-tools
grub-ieee1275
busybox
+zstd
powerpc-utils
powerpc-ibm-utils
linux-image-powerpc64le
@@ -310,6 +322,7 @@
#ifdef ARCH_alpha
initramfs-tools
busybox
+zstd
aboot
linux-image-alpha-generic
linux-image-alpha-smp
@@ -318,6 +331,7 @@
#ifdef ARCH_hppa
initramfs-tools
busybox
+zstd
palo
linux-image-parisc
linux-image-parisc64-smp
diff -Nru debian-cd-3.2.0/tools/link.pl debian-cd-3.2.1/tools/link.pl
--- debian-cd-3.2.0/tools/link.pl 2021-04-23 04:39:28.000000000 +0200
+++ debian-cd-3.2.1/tools/link.pl 2023-04-01 00:14:58.000000000 +0200
@@ -35,19 +35,19 @@
if ($symlink_farm) {
print "Symlink: $dest => $src\n" if ($link_verbose >=
3);
if (not symlink ($src, $dest)) {
- print STDERR "Symlink from $src to $dest
failed: $!\n";
+ die "Symlink from $src to $dest failed: $!\n";
}
} elsif ($link_copy) {
print "Copy: $dest => $src\n" if ($link_verbose >= 3);
if (system("cp -ap $src $dest")) {
my $err_num = $? >> 8;
my $sig_num = $? & 127;
- print STDERR "Copy from $src to $dest failed:
cp exited with error code $err_num, signal $sig_num\n";
+ die "Copy from $src to $dest failed: cp exited
with error code $err_num, signal $sig_num\n";
}
} else {
print "Hardlink: $dest => $src\n" if ($link_verbose >=
3);
if (not link ($src, $dest)) {
- print STDERR "Link from $src to $dest failed:
$!\n";
+ die "Link from $src to $dest failed: $!\n";
}
}
}
@@ -64,7 +64,7 @@
if ($to = readlink($link)) {
$link = $dir . $to;
} else {
- print STDERR "Can't readlink $link: $!\n";
+ die "Can't readlink $link: $!\n";
}
}
diff -Nru debian-cd-3.2.0/tools/make_disc_trees.pl
debian-cd-3.2.1/tools/make_disc_trees.pl
--- debian-cd-3.2.0/tools/make_disc_trees.pl 2023-02-24 17:01:54.000000000
+0100
+++ debian-cd-3.2.1/tools/make_disc_trees.pl 2023-04-01 00:14:58.000000000
+0200
@@ -1239,10 +1239,9 @@
$blocks_added += get_file_blocks("$dir/firmware/dep11/README.txt");
}
- msg_ap(0, "Symlink fw package $p into /firmware\n");
- symlink("../$file", "$dir/firmware/$base_file")
- or die "unable to create $dir/firmware/$base_file symlink: $!";
- msg_ap(0, "Symlink ../$file $dir/firmware/.\n");
+ msg_ap(0, "Link fw package $p into /firmware\n");
+ $blocks_added += good_link("$dir/firmware/../$file",
"$dir/firmware/$base_file");
+ msg_ap(0, "Link ../$file $dir/firmware/.\n");
# Cope with maybe having the patterns file already
# (e.g. multi-arch), in which case we'll replace it here
