diff mbox series

[SRU,focal/linux-raspi,v2] UBUNTU: [Packaging] raspi: Depend on crda

Message ID 20200625054430.8275-1-juergh@canonical.com
State New
Headers show
Series [SRU,focal/linux-raspi,v2] UBUNTU: [Packaging] raspi: Depend on crda | expand

Commit Message

Juerg Haefliger June 25, 2020, 5:44 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1877415

crda is required to configure the wifi region. For the main kernel, crda is
a dependency of the modules extra package. Since the raspi kernel doesn't
provide a modules extra package, add the dependency to the modules package
instead so that it gets pulled into the preinstallled images during image
build.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 debian.raspi/control.d/flavour-control.stub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Bader June 25, 2020, 8:38 a.m. UTC | #1
On 25.06.20 07:44, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1877415
> 
> crda is required to configure the wifi region. For the main kernel, crda is
> a dependency of the modules extra package. Since the raspi kernel doesn't
> provide a modules extra package, add the dependency to the modules package
> instead so that it gets pulled into the preinstallled images during image
> build.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---

Nothing relevant for this change but note that the description of the
linux-modules package has a confusing "extra" in it...

Stefan

>  debian.raspi/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi/control.d/flavour-control.stub b/debian.raspi/control.d/flavour-control.stub
> index ce8b81a11f60..9f5d47e91d75 100644
> --- a/debian.raspi/control.d/flavour-control.stub
> +++ b/debian.raspi/control.d/flavour-control.stub
> @@ -49,7 +49,7 @@ Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}, crda
>  Built-Using: ${linux:BuiltUsing}
>  Description: Linux kernel extra modules for version PKGVER on DESC
>   Contains the corresponding System.map file, the modules built by the
>
Juerg Haefliger June 25, 2020, 9:58 a.m. UTC | #2
On Thu, 25 Jun 2020 10:38:36 +0200
Stefan Bader <stefan.bader@canonical.com> wrote:

> On 25.06.20 07:44, Juerg Haefliger wrote:
> > BugLink: https://bugs.launchpad.net/bugs/1877415
> > 
> > crda is required to configure the wifi region. For the main kernel, crda is
> > a dependency of the modules extra package. Since the raspi kernel doesn't
> > provide a modules extra package, add the dependency to the modules package
> > instead so that it gets pulled into the preinstallled images during image
> > build.
> > 
> > Signed-off-by: Juerg Haefliger <juergh@canonical.com>  
> Acked-by: Stefan Bader <stefan.bader@canonical.com>
> > ---  
> 
> Nothing relevant for this change but note that the description of the
> linux-modules package has a confusing "extra" in it...

Hrm. That also seems to be a general problem with the main kernel across the
board:

bionic:
ii  linux-modules-4.15.0-101-generic 4.15.0-101.102                           amd64        Linux kernel extra modules for version 4.15.0 on 64 bit x86 SMP

eoan:
ii  linux-modules-5.3.0-59-generic      5.3.0-59.53                           amd64        Linux kernel extra modules for version 5.3.0 on 64 bit x86 SMP

focal:
ii  linux-modules-5.4.0-29-generic      5.4.0-29.33                           amd64        Linux kernel extra modules for version 5.4.0 on 64 bit x86 SMP


...Juerg


> Stefan
> 
> >  debian.raspi/control.d/flavour-control.stub | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/debian.raspi/control.d/flavour-control.stub b/debian.raspi/control.d/flavour-control.stub
> > index ce8b81a11f60..9f5d47e91d75 100644
> > --- a/debian.raspi/control.d/flavour-control.stub
> > +++ b/debian.raspi/control.d/flavour-control.stub
> > @@ -49,7 +49,7 @@ Build-Profiles: <!stage1>
> >  Architecture: ARCH
> >  Section: kernel
> >  Priority: optional
> > -Depends: ${misc:Depends}, ${shlibs:Depends}
> > +Depends: ${misc:Depends}, ${shlibs:Depends}, crda
> >  Built-Using: ${linux:BuiltUsing}
> >  Description: Linux kernel extra modules for version PKGVER on DESC
> >   Contains the corresponding System.map file, the modules built by the
> >   
> 
>
Kleber Souza July 1, 2020, 10:19 a.m. UTC | #3
On 2020-06-25 07:44, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1877415
> 
> crda is required to configure the wifi region. For the main kernel, crda is
> a dependency of the modules extra package. Since the raspi kernel doesn't
> provide a modules extra package, add the dependency to the modules package
> instead so that it gets pulled into the preinstallled images during image
> build.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  debian.raspi/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi/control.d/flavour-control.stub b/debian.raspi/control.d/flavour-control.stub
> index ce8b81a11f60..9f5d47e91d75 100644
> --- a/debian.raspi/control.d/flavour-control.stub
> +++ b/debian.raspi/control.d/flavour-control.stub
> @@ -49,7 +49,7 @@ Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}, crda
>  Built-Using: ${linux:BuiltUsing}
>  Description: Linux kernel extra modules for version PKGVER on DESC
>   Contains the corresponding System.map file, the modules built by the
>
Kleber Souza July 3, 2020, 3:11 p.m. UTC | #4
On 2020-06-25 07:44, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/1877415
> 
> crda is required to configure the wifi region. For the main kernel, crda is
> a dependency of the modules extra package. Since the raspi kernel doesn't
> provide a modules extra package, add the dependency to the modules package
> instead so that it gets pulled into the preinstallled images during image
> build.
> 
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>
> ---
>  debian.raspi/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi/control.d/flavour-control.stub b/debian.raspi/control.d/flavour-control.stub
> index ce8b81a11f60..9f5d47e91d75 100644
> --- a/debian.raspi/control.d/flavour-control.stub
> +++ b/debian.raspi/control.d/flavour-control.stub
> @@ -49,7 +49,7 @@ Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}, crda
>  Built-Using: ${linux:BuiltUsing}
>  Description: Linux kernel extra modules for version PKGVER on DESC
>   Contains the corresponding System.map file, the modules built by the
> 

Applied to focal/linux-raspi.

Thanks,
Kleber
diff mbox series

Patch

diff --git a/debian.raspi/control.d/flavour-control.stub b/debian.raspi/control.d/flavour-control.stub
index ce8b81a11f60..9f5d47e91d75 100644
--- a/debian.raspi/control.d/flavour-control.stub
+++ b/debian.raspi/control.d/flavour-control.stub
@@ -49,7 +49,7 @@  Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, crda
 Built-Using: ${linux:BuiltUsing}
 Description: Linux kernel extra modules for version PKGVER on DESC
  Contains the corresponding System.map file, the modules built by the