[PATCH][MASTER][kernel-snaps] efi: download wireless-regdb to ensure regulatory.db is in the snap

Dimitri John Ledkov xnox at ubuntu.com
Wed Oct 14 15:55:49 UTC 2020


Makefile.vmlinuz uses apt to install dependencies, which recursively
resolves dependies when preparing chroot/. It installs
linux-modules-extra-$(KVER)-$(FLAVOUR) which depends on crda, which
depends on wireless-regdb, which installs /lib/firmware/regulatory.db.

Makefile.efi instead downloads and unpacks individual debs, ignoring
recursive dependencies. This resulted in wireless-regdb not getting
installed in the chroot, and thus UC20 efi based kernel snaps have no
wifi regulatory db.

BugLink: https://launchpad.net/bugs/1899805

Signed-off-by: Dimitri John Ledkov <xnox at ubuntu.com>
---
 Patch for
 $ git clone -b master https://git.launchpad.net/~canonical-kernel-snaps/+git/kernel-snaps-uc20

 Makefile.efi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.efi b/Makefile.efi
index 8745ebc71c..db828cf2ce 100644
--- a/Makefile.efi
+++ b/Makefile.efi
@@ -28,7 +28,7 @@ endif
 
 prepare-kernel: prepare-host
 	mkdir chroot
-	apt-get download linux-firmware $(KERNELDEB) linux-image-$(ABI)-$(FLAVOUR) linux-modules-$(ABI)-$(FLAVOUR)
+	apt-get download linux-firmware wireless-regdb $(KERNELDEB) linux-image-$(ABI)-$(FLAVOUR) linux-modules-$(ABI)-$(FLAVOUR)
 	if [ "$(FLAVOUR)" != "lowlatency" ]; then \
 	  apt-get download linux-modules-extra-$(ABI)-$(FLAVOUR); \
 	fi
-- 
2.27.0




More information about the kernel-team mailing list