Hi,
Holger Wansing <hwans...@mailbox.org> wrote:
> Yes, that works fine, using a netboot image, I am NOT asked to provide
> firmware for regulatory.db file, because it's already included in the d-i
> image.
>
> However, that's only true for netboot images!
>
> My wireless card (on an IBM Thinkpad T60) is also usable with DVD/CD netinst
> images
> (so related kernel modules seem to be included in those images; I have
> explicitly
> tested that with said images on that T60), so probably wireless-regdb-udeb
> should just
> be added to all Linux d-i images?
I prepared a patch for this (includes removing it from the netboot/* files,
since it's now added generally in pkg-lists/base).
Will apply it, if noone objects.
Holger
--
Holger Wansing <hwans...@mailbox.org>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
diff --git a/build/pkg-lists/base b/build/pkg-lists/base
index e5a6c6fba..bf6dc22b0 100644
--- a/build/pkg-lists/base
+++ b/build/pkg-lists/base
@@ -28,3 +28,7 @@ kldutils-udeb [kfreebsd]
# Avoid entropy starvation issues (#923675):
haveged-udeb [linux]
+
+# Needed, when nic-wireless kernel modules are included,
+# which seems to be the case on nearly all linux arch images
+wireless-regdb-udeb [linux]
diff --git a/build/pkg-lists/netboot/alpha.cfg b/build/pkg-lists/netboot/alpha.cfg
index 6395df6e2..db687ccc1 100644
--- a/build/pkg-lists/netboot/alpha.cfg
+++ b/build/pkg-lists/netboot/alpha.cfg
@@ -3,7 +3,6 @@ srm-modules-${kernel:Version}
nic-shared-modules-${kernel:Version}
nic-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
console-setup-pc-ekmap
console-setup-udeb
diff --git a/build/pkg-lists/netboot/amd64.cfg b/build/pkg-lists/netboot/amd64.cfg
index 31e4d7b1a..82d663537 100644
--- a/build/pkg-lists/netboot/amd64.cfg
+++ b/build/pkg-lists/netboot/amd64.cfg
@@ -5,7 +5,6 @@ bogl-bterm-udeb
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
virtio-modules-${kernel:Version} ?
hyperv-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
diff --git a/build/pkg-lists/netboot/arm64.cfg b/build/pkg-lists/netboot/arm64.cfg
index 0af7b84e9..01fe2b0a5 100644
--- a/build/pkg-lists/netboot/arm64.cfg
+++ b/build/pkg-lists/netboot/arm64.cfg
@@ -10,7 +10,6 @@ netcfg
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
virtio-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
diff --git a/build/pkg-lists/netboot/armhf.cfg b/build/pkg-lists/netboot/armhf.cfg
index 46ffac580..cd9ed4435 100644
--- a/build/pkg-lists/netboot/armhf.cfg
+++ b/build/pkg-lists/netboot/armhf.cfg
@@ -10,7 +10,6 @@ netcfg
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
virtio-modules-${kernel:Version} ?
fb-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/netboot/i386.cfg b/build/pkg-lists/netboot/i386.cfg
index bf6ff7572..3d06ec1fc 100644
--- a/build/pkg-lists/netboot/i386.cfg
+++ b/build/pkg-lists/netboot/i386.cfg
@@ -5,7 +5,6 @@ bogl-bterm-udeb
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
virtio-modules-${kernel:Version} ?
hyperv-modules-${kernel:Version} ?
usb-modules-${kernel:Version}
diff --git a/build/pkg-lists/netboot/mips.cfg b/build/pkg-lists/netboot/mips.cfg
index e5186cbeb..ad861e094 100644
--- a/build/pkg-lists/netboot/mips.cfg
+++ b/build/pkg-lists/netboot/mips.cfg
@@ -10,5 +10,4 @@ netcfg
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
virtio-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/netboot/mips64el.cfg b/build/pkg-lists/netboot/mips64el.cfg
index e5186cbeb..ad861e094 100644
--- a/build/pkg-lists/netboot/mips64el.cfg
+++ b/build/pkg-lists/netboot/mips64el.cfg
@@ -10,5 +10,4 @@ netcfg
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
virtio-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/netboot/mipsel.cfg b/build/pkg-lists/netboot/mipsel.cfg
index e5186cbeb..ad861e094 100644
--- a/build/pkg-lists/netboot/mipsel.cfg
+++ b/build/pkg-lists/netboot/mipsel.cfg
@@ -10,5 +10,4 @@ netcfg
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-wireless-regdb-udeb
virtio-modules-${kernel:Version} ?
diff --git a/debian/changelog b/debian/changelog
index 43deab00b..ba86bb85f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ debian-installer (20201203) UNRELEASED; urgency=medium
[ Steve McIntyre ]
* Bump Linux kernel ABI to 5.10.0-1
+ [ Holger Wansing ]
+ * Add wireless-regdb-udeb to all Linux arch images (#979104).
+
-- Shawn Guo <shawn....@linaro.org> Sat, 12 Dec 2020 12:11:26 +0000
debian-installer (20201202) unstable; urgency=medium
