| Message ID | 20221025071604.702-9-dimitri.ledkov@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,K,linux-raspi] UBUNTU: [Packaging] remove circular dep between modules and image | expand |
Applied to k/linux-raspi master-next branch. ...Juerg > 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@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 5326ff97e870..5fe85125990a 100644 > --- a/debian.raspi/control.d/flavour-control.stub > +++ b/debian.raspi/control.d/flavour-control.stub > @@ -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 > +Depends: ${misc:Depends}, ${shlibs:Depends}, 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. > . > Supports SUPPORTED processors. > .
diff --git a/debian.raspi/control.d/flavour-control.stub b/debian.raspi/control.d/flavour-control.stub index 5326ff97e870..5fe85125990a 100644 --- a/debian.raspi/control.d/flavour-control.stub +++ b/debian.raspi/control.d/flavour-control.stub @@ -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 +Depends: ${misc:Depends}, ${shlibs:Depends}, 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. . Supports SUPPORTED processors. .
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@canonical.com> --- debian.raspi/control.d/flavour-control.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)