diff mbox series

[SRU,B/raspi2] UBUNTU: [Packaging] raspi2: Depend on crda

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

Commit Message

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

Comments

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

On 5/4/22 00:58, 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.raspi2/control.d/flavour-control.stub | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi2/control.d/flavour-control.stub b/debian.raspi2/control.d/flavour-control.stub
> index 9ed4cc88c356..ec23a6aa6c30 100644
> --- a/debian.raspi2/control.d/flavour-control.stub
> +++ b/debian.raspi2/control.d/flavour-control.stub
> @@ -48,7 +48,7 @@ Build-Profiles: <!stage1>
>   Architecture: ARCH
>   Section: kernel
>   Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}, crda
>   Description: Linux kernel extra modules for version PKGVER on DESC
>    Contains the corresponding System.map file, the modules built by the
>    packager, and scripts that try to ensure that the system is not left in an
Stefan Bader May 5, 2022, 8 a.m. UTC | #2
On 04.05.22 08:58, 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.raspi2/control.d/flavour-control.stub | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi2/control.d/flavour-control.stub b/debian.raspi2/control.d/flavour-control.stub
> index 9ed4cc88c356..ec23a6aa6c30 100644
> --- a/debian.raspi2/control.d/flavour-control.stub
> +++ b/debian.raspi2/control.d/flavour-control.stub
> @@ -48,7 +48,7 @@ Build-Profiles: <!stage1>
>   Architecture: ARCH
>   Section: kernel
>   Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}, crda
>   Description: Linux kernel extra modules for version PKGVER on DESC
>    Contains the corresponding System.map file, the modules built by the
>    packager, and scripts that try to ensure that the system is not left in an
Juerg Haefliger May 5, 2022, 11:22 a.m. UTC | #3
Applied to bionic/raspi2 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.raspi2/control.d/flavour-control.stub | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.raspi2/control.d/flavour-control.stub b/debian.raspi2/control.d/flavour-control.stub
> index 9ed4cc88c356..ec23a6aa6c30 100644
> --- a/debian.raspi2/control.d/flavour-control.stub
> +++ b/debian.raspi2/control.d/flavour-control.stub
> @@ -48,7 +48,7 @@ Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}, crda
>  Description: Linux kernel extra modules for version PKGVER on DESC
>   Contains the corresponding System.map file, the modules built by the
>   packager, and scripts that try to ensure that the system is not left in an
diff mbox series

Patch

diff --git a/debian.raspi2/control.d/flavour-control.stub b/debian.raspi2/control.d/flavour-control.stub
index 9ed4cc88c356..ec23a6aa6c30 100644
--- a/debian.raspi2/control.d/flavour-control.stub
+++ b/debian.raspi2/control.d/flavour-control.stub
@@ -48,7 +48,7 @@  Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, crda
 Description: Linux kernel extra modules for version PKGVER on DESC
  Contains the corresponding System.map file, the modules built by the
  packager, and scripts that try to ensure that the system is not left in an