mbox series

[SRU,K,0/8] UBUNTU: [Packaging] remove circular dep between modules and image

Message ID 20221025071604.702-1-dimitri.ledkov@canonical.com
Headers show
Series UBUNTU: [Packaging] remove circular dep between modules and image | expand

Message

Dimitri John Ledkov Oct. 25, 2022, 7:15 a.m. UTC
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.

This has already been applied to generic kernel, these are patches for
all the remaining kernels in kinetic.

BugLink: https://bugs.launchpad.net/bugs/1989334
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>

Dimitri John Ledkov (1):
  [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
    between modules and image

 debian.*/control.d/flavour-control.stub | 4 ++--
 1 file changed, 2 insertion(+), 2 deletion(-)

Comments

Stefan Bader Oct. 26, 2022, 8:09 a.m. UTC | #1
On 25.10.22 09:15, Dimitri John Ledkov 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.
> 
> This has already been applied to generic kernel, these are patches for
> all the remaining kernels in kinetic.
> 
> BugLink: https://bugs.launchpad.net/bugs/1989334
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> 
> Dimitri John Ledkov (1):
>    [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
>      between modules and image
> 
>   debian.*/control.d/flavour-control.stub | 4 ++--
>   1 file changed, 2 insertion(+), 2 deletion(-)
> 

There are some sources which only get the modules-extra part changed. That might 
be because the dependency was already removed for modules or forgotten. 
Impossible to tell from the patches. A note about it here would be helpful...

-Stefan
Dimitri John Ledkov Oct. 26, 2022, 8:17 a.m. UTC | #2
On Wed, 26 Oct 2022, 10:09 Stefan Bader, <stefan.bader@canonical.com> wrote:

> On 25.10.22 09:15, Dimitri John Ledkov 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.
> >
> > This has already been applied to generic kernel, these are patches for
> > all the remaining kernels in kinetic.
> >
> > BugLink: https://bugs.launchpad.net/bugs/1989334
> > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> >
> > Dimitri John Ledkov (1):
> >    [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
> >      between modules and image
> >
> >   debian.*/control.d/flavour-control.stub | 4 ++--
> >   1 file changed, 2 insertion(+), 2 deletion(-)
> >
>
> There are some sources which only get the modules-extra part changed. That
> might
> be because the dependency was already removed for modules or forgotten.
> Impossible to tell from the patches. A note about it here would be
> helpful...
>

True, maybe I should have increased context. It is correct, that each
kernel got different set of changes. Most only had incorrect modules-extra
deps, and only few had out of date modules package.

I can try to generate patches with longer context such that it it obvious
which packages getting which changes.

>
Stefan Bader Oct. 26, 2022, 8:35 a.m. UTC | #3
On 26.10.22 10:17, Dimitri John Ledkov wrote:
> 
> 
> On Wed, 26 Oct 2022, 10:09 Stefan Bader, <stefan.bader@canonical.com 
> <mailto:stefan.bader@canonical.com>> wrote:
> 
>     On 25.10.22 09:15, Dimitri John Ledkov 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.
>      >
>      > This has already been applied to generic kernel, these are patches for
>      > all the remaining kernels in kinetic.
>      >
>      > BugLink: https://bugs.launchpad.net/bugs/1989334
>     <https://bugs.launchpad.net/bugs/1989334>
>      > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com
>     <mailto:dimitri.ledkov@canonical.com>>
>      >
>      > Dimitri John Ledkov (1):
>      >    [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
>      >      between modules and image
>      >
>      >   debian.*/control.d/flavour-control.stub | 4 ++--
>      >   1 file changed, 2 insertion(+), 2 deletion(-)
>      >
> 
>     There are some sources which only get the modules-extra part changed. That
>     might
>     be because the dependency was already removed for modules or forgotten.
>     Impossible to tell from the patches. A note about it here would be helpful...
> 
> 
> True, maybe I should have increased context. It is correct, that each kernel got 
> different set of changes. Most only had incorrect modules-extra deps, and only 
> few had out of date modules package.
> 
> I can try to generate patches with longer context such that it it obvious which 
> packages getting which changes.
> 
Enough to have it here now. But as a reminder to think about reviewers context 
next time.
Stefan Bader Oct. 26, 2022, 8:35 a.m. UTC | #4
On 25.10.22 09:15, Dimitri John Ledkov 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.
> 
> This has already been applied to generic kernel, these are patches for
> all the remaining kernels in kinetic.
> 
> BugLink: https://bugs.launchpad.net/bugs/1989334
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> 
> Dimitri John Ledkov (1):
>    [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
>      between modules and image
> 
>   debian.*/control.d/flavour-control.stub | 4 ++--
>   1 file changed, 2 insertion(+), 2 deletion(-)
> 

Acked-by: Stefan Bader <stefan.bader@canonical.com>
Luke Nowakowski-Krijger Oct. 26, 2022, 4:44 p.m. UTC | #5
I was wondering the other day why it was like this.

Acked-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com>

On Tue, Oct 25, 2022 at 12:17 AM 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.
>
> This has already been applied to generic kernel, these are patches for
> all the remaining kernels in kinetic.
>
> BugLink: https://bugs.launchpad.net/bugs/1989334
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
>
> Dimitri John Ledkov (1):
>   [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
>     between modules and image
>
>  debian.*/control.d/flavour-control.stub | 4 ++--
>  1 file changed, 2 insertion(+), 2 deletion(-)
>
> --
> 2.34.1
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
Tim Gardner Oct. 27, 2022, 3:22 p.m. UTC | #6
On 10/25/22 1:15 AM, Dimitri John Ledkov 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.
> 
> This has already been applied to generic kernel, these are patches for
> all the remaining kernels in kinetic.
> 
> BugLink: https://bugs.launchpad.net/bugs/1989334
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> 
> Dimitri John Ledkov (1):
>    [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
>      between modules and image
> 
>   debian.*/control.d/flavour-control.stub | 4 ++--
>   1 file changed, 2 insertion(+), 2 deletion(-)
> 
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Dimitri John Ledkov Nov. 16, 2022, 2:29 p.m. UTC | #7
Applied to all repos master-next branches.

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.
>
> This has already been applied to generic kernel, these are patches for
> all the remaining kernels in kinetic.
>
> BugLink: https://bugs.launchpad.net/bugs/1989334
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
>
> Dimitri John Ledkov (1):
>   [SRU][K linux-*][PATCH] UBUNTU: [Packaging] remove circular dep
>     between modules and image
>
>  debian.*/control.d/flavour-control.stub | 4 ++--
>  1 file changed, 2 insertion(+), 2 deletion(-)
>
> --
> 2.34.1
>