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

[Dimitri John Ledkov]

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.gcp/control.d/flavour-control.stub | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.gcp/control.d/flavour-control.stub b/debian.gcp/control.d/flavour-control.stub
index 59c99c818242..929f62d15801 100644
--- a/debian.gcp/control.d/flavour-control.stub
+++ b/debian.gcp/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