APPLIED: [SRU][K linux-kvm][PATCH] UBUNTU: [Packaging] remove circular dep between modules and image

[Dimitri John Ledkov]

Applied to kinetic:linux-kvm master-next branch

On Tue, 25 Oct 2022 at 08:16, Dimitri John Ledkov
<dimitri.ledkov at canonical.com> wrote:
>
> Currently we have circular dependencies between linux-image and
> linux-modules/linux-modules-extra packages. This is redundant, and
> harmful when additional types of linux-images are provided
> (i.e. kernel.efi).
>
> Break the circular dependency by only keeping linux-image ->
> linux-modules dep, remove linux-modules -> linux-image dep, remove
> linux-modules-extra -> linux-image dep, add linux-modules-extra ->
> linux-modules dep.
>
> BugLink: https://bugs.launchpad.net/bugs/1989334
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
> ---
>  debian.kvm/control.d/flavour-control.stub | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/debian.kvm/control.d/flavour-control.stub b/debian.kvm/control.d/flavour-control.stub
> index cbe4624f5ba0..abb63a6b984f 100644
> --- a/debian.kvm/control.d/flavour-control.stub
> +++ b/debian.kvm/control.d/flavour-control.stub
> @@ -46,13 +46,13 @@ Description: Linux kernel image for version PKGVER on DESC
>
>  Package: linux-modules-PKGVER-ABINUM-FLAVOUR
>  Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR
> +Depends: ${misc:Depends}, ${shlibs:Depends}
>  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
>   packager, and scripts that try to ensure that the system is not left in an
>   unbootable state after an update.
>   .
> @@ -66,13 +66,13 @@ Description: Linux kernel extra modules for version PKGVER on DESC
>
>  Package: linux-modules-extra-PKGVER-ABINUM-FLAVOUR
>  Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR, wireless-regdb
> +Depends: ${misc:Depends}, ${shlibs:Depends}, wireless-regdb, linux-modules-PKGVER-ABINUM-FLAVOUR
>  Description: Linux kernel extra modules for version PKGVER on DESC
>   This package contains the Linux kernel extra modules for version PKGVER on
>   DESC.
>   .
>   Also includes 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
> --
> 2.34.1
>


-- 
okurrr,

Dimitri