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

[Stefan Bader]

On 14.10.20 17:55, Dimitri John Ledkov wrote:
> 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>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---

and

Applied to focal/kernel-snaps-uc20/master. Thanks.

-Stefan
>  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
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20201118/f7ca794f/attachment.sig>