Package: debian-cd
Version: 3.2.2
Severity: normal
Tags: d-i patch
Dear Debian Images Team,
The Weekly build of the installer image for amd64 has grown by 4%:
* 811597824 Jun 16 00:23 debian-testing-amd64-netinst.is0
* 846200832 Jun 22 22:39 debian-testing-amd64-netinst.iso
This is caused by the following directory:
pool/main/l/linux-signed-amd64
having two versions of each of the 29 kernel udebs.
The first five pairs:
* btrfs-modules-6.12.32-amd64-di_6.12.32-1_amd64.udeb
* btrfs-modules-6.12.33+deb13-amd64-di_6.12.33-1_amd64.udeb
* crypto-dm-modules-6.12.32-amd64-di_6.12.32-1_amd64.udeb
* crypto-dm-modules-6.12.33+deb13-amd64-di_6.12.33-1_amd64.udeb
* crypto-modules-6.12.32-amd64-di_6.12.32-1_amd64.udeb
* crypto-modules-6.12.33+deb13-amd64-di_6.12.33-1_amd64.udeb
* drm-core-modules-6.12.32-amd64-di_6.12.32-1_amd64.udeb
* drm-core-modules-6.12.33+deb13-amd64-di_6.12.33-1_amd64.udeb
* ext4-modules-6.12.32-amd64-di_6.12.32-1_amd64.udeb
* ext4-modules-6.12.33+deb13-amd64-di_6.12.33-1_amd64.udeb
Déjà vu:
#1084789 - debian-testing-amd64-netinst.iso has multiple versions of module
udebs
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1084789
which was fixed by debian-cd Commit deeff067:
generate_di_list: Cope with package name changes in udeb packages.
https://salsa.debian.org/images-team/debian-cd/-/commit/deeff067
However, linux Commit 706d933b:
Include target Debian release number in ABI name
https://salsa.debian.org/kernel-team/linux/-/commit/706d933b
causes the problem in this bug report.
Minimally tested patch below.
Thank you!
Daniel Lewart
Urbana, Illinois
diff -ru a/tools/generate_di_list b/tools/generate_di_list
--- a/tools/generate_di_list 2025-06-24 14:46:12.000000000 -0500
+++ b/tools/generate_di_list 2025-06-29 00:00:00.000000000 -0500
@@ -141,7 +141,7 @@
# Append this driver udeb to a list for that kernel_ver
push(@{ $driver_udebs{$kernel_ver} }, $udeb);
- } elsif ($udeb =~ m/-modules-(\d+)\.(\d+)\.(\d+)-.*-di/) {
+ } elsif ($udeb =~
m/-modules-(\d+)\.(\d+)\.(\d+)(\+deb\d+)?-.*-di$/) {
# Newer udeb package names don't, so use "0" as a dummy
value here
my $kernel_ver = di_ker_abi_to_number($1, $2, $3, 0);
if ($kernel_ver > $highest_kernel_ver) {
