diff mbox series

[SRU,B/raspi-5.4] UBUNTU: [Packaging] raspi-bionic: Depend on crda

Message ID 20220504065909.10913-1-juergh@canonical.com
State New
Headers show
Series [SRU,B/raspi-5.4] UBUNTU: [Packaging] raspi-bionic: Depend on crda | expand

Commit Message

Juerg Haefliger May 4, 2022, 6:59 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-bionic/control.d/flavour-control.stub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tim Gardner May 4, 2022, 4:09 p.m. UTC | #1
Acked-by: Tim Gardner <tim.gardner@canonical.com>

On 5/4/22 00:59, 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-bionic/control.d/flavour-control.stub | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi-bionic/control.d/flavour-control.stub b/debian.raspi-bionic/control.d/flavour-control.stub
> index ce8b81a11f60..9f5d47e91d75 100644
> --- a/debian.raspi-bionic/control.d/flavour-control.stub
> +++ b/debian.raspi-bionic/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
Stefan Bader May 5, 2022, 8 a.m. UTC | #2
On 04.05.22 08:59, 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>
> ---
>   debian.raspi-bionic/control.d/flavour-control.stub | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi-bionic/control.d/flavour-control.stub b/debian.raspi-bionic/control.d/flavour-control.stub
> index ce8b81a11f60..9f5d47e91d75 100644
> --- a/debian.raspi-bionic/control.d/flavour-control.stub
> +++ b/debian.raspi-bionic/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 May 5, 2022, 11:23 a.m. UTC | #3
Applied to bionic/raspi-5.4 master-next branch.

...Juerg


> 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-bionic/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi-bionic/control.d/flavour-control.stub b/debian.raspi-bionic/control.d/flavour-control.stub
> index ce8b81a11f60..9f5d47e91d75 100644
> --- a/debian.raspi-bionic/control.d/flavour-control.stub
> +++ b/debian.raspi-bionic/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
diff mbox series

Patch

diff --git a/debian.raspi-bionic/control.d/flavour-control.stub b/debian.raspi-bionic/control.d/flavour-control.stub
index ce8b81a11f60..9f5d47e91d75 100644
--- a/debian.raspi-bionic/control.d/flavour-control.stub
+++ b/debian.raspi-bionic/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