| Message ID | 20221025071604.702-5-dimitri.ledkov@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | UBUNTU: [Packaging] remove circular dep between modules and image | expand |
applied to kinetic:linux-ibm master-next branch On Tue, 25 Oct 2022 at 08:16, Dimitri John Ledkov <dimitri.ledkov@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@canonical.com> > --- > debian.ibm/control.d/flavour-control.stub | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian.ibm/control.d/flavour-control.stub b/debian.ibm/control.d/flavour-control.stub > index d59a64bd2c3c..c3d0df943fc5 100644 > --- a/debian.ibm/control.d/flavour-control.stub > +++ b/debian.ibm/control.d/flavour-control.stub > @@ -65,13 +65,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 > +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. > . > 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 >
diff --git a/debian.ibm/control.d/flavour-control.stub b/debian.ibm/control.d/flavour-control.stub index d59a64bd2c3c..c3d0df943fc5 100644 --- a/debian.ibm/control.d/flavour-control.stub +++ b/debian.ibm/control.d/flavour-control.stub @@ -65,13 +65,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 +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. . 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
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.ibm/control.d/flavour-control.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)