[Lucid][SRU][PATCH 1/1] UBUNTU: Remove conflicts statements for compat-wireless meta packages

Thu Dec 2 16:45:34 UTC 2010

On Thu, 2010-12-02 at 14:55 +0100, Stefan Bader wrote:
> On 12/02/2010 03:11 AM, Leann Ogasawara wrote:
> > BugLink: http://bugs.launchpad.net/bugs/683944
> > 
> > SRU Justification:
> > 
> > Examining the Lucid compat-wireless LBM meta packages it appears the
> > 'Conflicts:' statements in each of the debian/control.d flavours is
> > unnecessary. The LBM packages themselves already have the appropriate
> > 'Conflicts:' statements. Furthermore, they are coded in only one
> > location in each of the LBM packages
> > (debian/control.d/flavour-control.stub) which is much simpler to track
> > and update vs multiple separate files in each of the meta package
> > flavours.
> > 
> > Impact: The package resolver should do the right thing given each
> > compat-wireless-2.6.3X package has correct 'Conflicts"' statements in
> > its dependencies, thus there should be no impact.
> > 
> > Test Case: Test installing the LBM compat-wireless meta packages and
> > confirm multiple versions of the compat-wireless package are not
> > installable at the same time.
> > 
> Apart from it seeming in various states of being commented out, when testing,
> was there a difference in that the meta package was started to install and when
> pulling the real binary package, failed? Or just as before immediately fails
> when trying to install a conflicting meta package?

In my testing I saw the following:

Selecting previously deselected package
linux-backports-modules-wireless-2.6.35-lucid-generic.
(Reading database ... 218140 files and directories currently installed.)
Unpacking linux-backports-modules-wireless-2.6.35-lucid-generic (from
linux-backports-modules-wireless-2.6.35-lucid-generic_2.6.32.26.29_amd64.deb) ...
Selecting previously deselected package
linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic.
dpkg:
regarding .../linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic_2.6.32-26.25_amd64.deb containing linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic:
 linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic
conflicts with
linux-backports-modules-compat-wireless-2.6.36-2.6.32-26-generic
  linux-backports-modules-compat-wireless-2.6.36-2.6.32-26-generic
(version 2.6.32-26.25) is present and installed.
dpkg: error
processing ../linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic_2.6.32-26.25_amd64.deb (--install):
 conflicting packages - not installing
linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic
dpkg: dependency problems prevent configuration of
linux-backports-modules-wireless-2.6.35-lucid-generic:
 linux-backports-modules-wireless-2.6.35-lucid-generic depends on
linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic;
however:
  Package
linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic is not
installed.
dpkg: error processing
linux-backports-modules-wireless-2.6.35-lucid-generic (--install):
 dependency problems - leaving unconfigured
Errors were encountered while processing:
 ../linux-backports-modules-compat-wireless-2.6.35-2.6.32-26-generic_2.6.32-26.25_amd64.deb
 linux-backports-modules-wireless-2.6.35-lucid-generic

> > The following changes since commit 4134296463c7b57b21fba387d74cea6b8dcb26d2:
> > 
> >   UBUNTU: Ubuntu-2.6.32.27.29 (2010-11-30 16:47:53 -0800)
> > 
> > are available in the git repository at:
> >   git://kernel.ubuntu.com/ogasawara/ubuntu-lucid-meta.git lp683944
> > 
> > Leann Ogasawara (1):
> >       UBUNTU: Remove conflicts statements for compat-wireless meta packages
> > 
> >  meta-source/debian/control.d/generic     |   10 ----------
> >  meta-source/debian/control.d/generic-pae |    3 ---
> >  meta-source/debian/control.d/preempt     |   10 ----------
> >  meta-source/debian/control.d/server      |   10 ----------
> >  4 files changed, 0 insertions(+), 33 deletions(-)
> > 
> > From 579fc7ac2ddf64fe68934b59349ae0e175cea149 Mon Sep 17 00:00:00 2001
> > From: Leann Ogasawara <leann.ogasawara at canonical.com>
> > Date: Wed, 1 Dec 2010 17:50:51 -0800
> > Subject: [PATCH] UBUNTU: Remove conflicts statements for compat-wireless meta packages
> > 
> > BugLink: http://bugs.launchpad.net/bugs/683944
> > 
> > Examining the compat-wireless LBM meta packages it appears the
> > 'Conflicts:' statements in each of the debian/control.d flavours is
> > unnecessary. The LBM packages themselves already have the appropriate
> > 'Conflicts:' statements.  Furthermore, they are coded in only one
> > location in each of the LBM packages
> > (debian/control.d/flavour-control.stub) which is much simpler to track
> > and update vs. 6 or 8 separate files in each of the meta package flavour
> > files.
> > 
> > Remove the conflicts statements for the compat-wireless meta packages.
> > 
> > Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
> > ---
> >  meta-source/debian/control.d/generic     |   10 ----------
> >  meta-source/debian/control.d/generic-pae |    3 ---
> >  meta-source/debian/control.d/preempt     |   10 ----------
> >  meta-source/debian/control.d/server      |   10 ----------
> >  4 files changed, 0 insertions(+), 33 deletions(-)
> > 
> > diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
> > index ec7a696..f9e798d 100644
> > --- a/meta-source/debian/control.d/generic
> > +++ b/meta-source/debian/control.d/generic
> > @@ -35,9 +35,6 @@ Description: Backported driver headers for generic kernel image
> >  Package: linux-backports-modules-wireless-RELEASE_NAME-generic
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-generic
> > -Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-generic
> >  Description: Backported wireless drivers for generic kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -45,9 +42,6 @@ Description: Backported wireless drivers for generic kernel image
> >  Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-generic
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-generic
> >  Description: Backported wireless drivers for generic kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -55,9 +49,6 @@ Description: Backported wireless drivers for generic kernel image
> >  Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-generic
> >  Description: Backported wireless drivers for generic kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -65,7 +56,6 @@ Description: Backported wireless drivers for generic kernel image
> >  #Package: linux-backports-modules-wireless-2.6.37-RELEASE_NAME-generic
> >  #Architecture: amd64 i386
> >  #Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-generic
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic
> >  #Description: Backported wireless drivers for generic kernel image
> >  # This empty package allows people to keep their backported wireless modules
> >  # up-to-date when upgrading their Linux kernel.
> > diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
> > index 3bcff41..b4302f3 100644
> > --- a/meta-source/debian/control.d/generic-pae
> > +++ b/meta-source/debian/control.d/generic-pae
> > @@ -35,7 +35,6 @@ Description: Backported driver headers for generic-pae kernel image
> >  Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-generic-pae
> > -Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic-pae
> >  Description: Backported wireless drivers for generic-pae kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -43,7 +42,6 @@ Description: Backported wireless drivers for generic-pae kernel image
> >  Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-generic-pae
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic-pae, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic-pae
> >  Description: Backported wireless drivers for generic-pae kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -51,7 +49,6 @@ Description: Backported wireless drivers for generic-pae kernel image
> >  Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic-pae
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic-pae, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae
> >  Description: Backported wireless drivers for generic-pae kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > diff --git a/meta-source/debian/control.d/preempt b/meta-source/debian/control.d/preempt
> > index 00ab360..e981aa7 100644
> > --- a/meta-source/debian/control.d/preempt
> > +++ b/meta-source/debian/control.d/preempt
> > @@ -35,9 +35,6 @@ Description: Backported driver headers for preempt kernel image
> >  Package: linux-backports-modules-wireless-RELEASE_NAME-preempt
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-preempt
> > -Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-preempt
> >  Description: Backported wireless drivers for preempt kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -45,9 +42,6 @@ Description: Backported wireless drivers for preempt kernel image
> >  Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-preempt
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-preempt
> >  Description: Backported wireless drivers for preempt kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -55,9 +49,6 @@ Description: Backported wireless drivers for preempt kernel image
> >  Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-preempt
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-preempt
> >  Description: Backported wireless drivers for preempt kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -65,7 +56,6 @@ Description: Backported wireless drivers for preempt kernel image
> >  #Package: linux-backports-modules-wireless-2.6.37-RELEASE_NAME-preempt
> >  #Architecture: amd64 i386
> >  #Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-preempt
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
> >  #Description: Backported wireless drivers for preempt kernel image
> >  # This empty package allows people to keep their backported wireless modules
> >  # up-to-date when upgrading their Linux kernel.
> > diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
> > index b546623..02129b5 100644
> > --- a/meta-source/debian/control.d/server
> > +++ b/meta-source/debian/control.d/server
> > @@ -35,9 +35,6 @@ Description: Backported driver headers for server kernel image
> >  Package: linux-backports-modules-wireless-RELEASE_NAME-server
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-server
> > -Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-server
> >  Description: Backported wireless drivers for server kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -45,9 +42,6 @@ Description: Backported wireless drivers for server kernel image
> >  Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-server
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-server
> >  Description: Backported wireless drivers for server kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -55,9 +49,6 @@ Description: Backported wireless drivers for server kernel image
> >  Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
> >  Architecture: amd64 i386
> >  Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-server
> > -Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server
> > -#Replace the above Conflicts line with the following when we decide to enable and build the compat-wireless-2.6.37 stack
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.37-RELEASE_NAME-server
> >  Description: Backported wireless drivers for server kernel image
> >   This empty package allows people to keep their backported wireless modules
> >   up-to-date when upgrading their Linux kernel.
> > @@ -65,7 +56,6 @@ Description: Backported wireless drivers for server kernel image
> >  #Package: linux-backports-modules-wireless-2.6.37-RELEASE_NAME-server
> >  #Architecture: amd64 i386
> >  #Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-server
> > -#Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
> >  #Description: Backported wireless drivers for server kernel image
> >  # This empty package allows people to keep their backported wireless modules
> >  # up-to-date when upgrading their Linux kernel.
> 
> 