Patchwork [Quantal,LBM,SRU,pull-request] Add Conflicts: statement for Precise LBM compat-wireless stacks

login
register
mail settings
Submitter Leann Ogasawara
Date Oct. 19, 2012, 7:28 p.m.
Message ID <5081A9C0.8050702@canonical.com>
Download mbox | patch
Permalink /patch/192796/
State New
Headers show

Pull-request

git://kernel.ubuntu.com/ogasawara/ubuntu-precise-lbm.git lp1068751

Comments

Leann Ogasawara - Oct. 19, 2012, 7:28 p.m.
== Quantal SRU Justification ==

We allow multiple upstream versions of the compat-wireless stack to be
packaged and installed via Precise LBM.  There currently exists a
potential for conflicts when installing multiple versions.  Add a
Conflicts: statement to the control file to ensure only a single stack
can be installed at a given time.

== Impact ===

There should be no risk of regression.  This just enforces a single
upstream stack can be installed at a given time.  I've tested various
combinations of installs and confirmed we receive an error if attempting
to install multiple stacks. eg:

 conflicting packages - not installing
linux-backports-modules-cw-3.6-3.2.0-32-generic

== Fix ==

The following changes since commit 88eeffbd798ca99e9f52eb7a4a81bddf07120fc1:

  UBUNTU: Ubuntu-3.2.0-33.18 (2012-10-17 10:58:42 +0100)

are available in the git repository at:

  git://kernel.ubuntu.com/ogasawara/ubuntu-precise-lbm.git lp1068751

for you to fetch changes up to fe0a5568ff6d2ead596eea658abe2b40f2494c2a:

  UBUNTU: Add Conflicts: for compat-wireless stacks (2012-10-19 10:51:03
-0700)

----------------------------------------------------------------
Leann Ogasawara (1):
      UBUNTU: Add Conflicts: for compat-wireless stacks

 debian/control.d/flavour-control.stub | 4 ++++
 1 file changed, 4 insertions(+)

Patch is inlined below as well for viewing convenience:

From fe0a5568ff6d2ead596eea658abe2b40f2494c2a Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 19 Oct 2012 10:18:18 -0700
Subject: [PATCH] UBUNTU: Add Conflicts: for compat-wireless stacks

BugLink: http://bugs.launchpad.net/bugs/1068751

We allow multiple upstream versions of the compat-wireless stack to be
packaged and installed via LBM. There currently exists a potential for
conflicts when installing multiple versions. Add a Conflicts: statement
to the control file to ensure only a single stack can be installed at a
given time.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian/control.d/flavour-control.stub |    4 ++++
 1 file changed, 4 insertions(+)
Leann Ogasawara - Oct. 19, 2012, 7:38 p.m.
Bah,  Quantal on the brain.  That is supposed to be for Precise.

On 10/19/2012 12:28 PM, Leann Ogasawara wrote:
> == Quantal SRU Justification ==

s/Quantal/Precise/

> We allow multiple upstream versions of the compat-wireless stack to be
> packaged and installed via Precise LBM.  There currently exists a
> potential for conflicts when installing multiple versions.  Add a
> Conflicts: statement to the control file to ensure only a single stack
> can be installed at a given time.
>
> == Impact ===
>
> There should be no risk of regression.  This just enforces a single
> upstream stack can be installed at a given time.  I've tested various
> combinations of installs and confirmed we receive an error if attempting
> to install multiple stacks. eg:
>
>  conflicting packages - not installing
> linux-backports-modules-cw-3.6-3.2.0-32-generic
>
> == Fix ==
>
> The following changes since commit 88eeffbd798ca99e9f52eb7a4a81bddf07120fc1:
>
>   UBUNTU: Ubuntu-3.2.0-33.18 (2012-10-17 10:58:42 +0100)
>
> are available in the git repository at:
>
>   git://kernel.ubuntu.com/ogasawara/ubuntu-precise-lbm.git lp1068751
>
> for you to fetch changes up to fe0a5568ff6d2ead596eea658abe2b40f2494c2a:
>
>   UBUNTU: Add Conflicts: for compat-wireless stacks (2012-10-19 10:51:03
> -0700)
>
> ----------------------------------------------------------------
> Leann Ogasawara (1):
>       UBUNTU: Add Conflicts: for compat-wireless stacks
>
>  debian/control.d/flavour-control.stub | 4 ++++
>  1 file changed, 4 insertions(+)
>
> Patch is inlined below as well for viewing convenience:
>
> From fe0a5568ff6d2ead596eea658abe2b40f2494c2a Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara@canonical.com>
> Date: Fri, 19 Oct 2012 10:18:18 -0700
> Subject: [PATCH] UBUNTU: Add Conflicts: for compat-wireless stacks
>
> BugLink: http://bugs.launchpad.net/bugs/1068751
>
> We allow multiple upstream versions of the compat-wireless stack to be
> packaged and installed via LBM. There currently exists a potential for
> conflicts when installing multiple versions. Add a Conflicts: statement
> to the control file to ensure only a single stack can be installed at a
> given time.
>
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  debian/control.d/flavour-control.stub |    4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/debian/control.d/flavour-control.stub b/debian/control.d/flavour-control.stub
> index 029d653..d644989 100644
> --- a/debian/control.d/flavour-control.stub
> +++ b/debian/control.d/flavour-control.stub
> @@ -24,6 +24,7 @@ Architecture: ARCH
>  Section: SECTION_IMAGE
>  Priority: optional
>  Provides: =PROVIDES=
> +Conflicts:linux-backports-modules-cw-3.4-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.5-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.6-PKGVER-ABINUM-FLAVOUR
>  Depends: linux-image-PKGVER-ABINUM-FLAVOUR
>  Pre-Depends: dpkg (>= 1.10.24)
>  Description: compat-wireless Linux modules for version PKGVER on DESC
> @@ -39,6 +40,7 @@ Architecture: ARCH
>  Section: SECTION_IMAGE
>  Priority: optional
>  Provides: =PROVIDES=
> +Conflicts:linux-backports-modules-cw-3.3-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.5-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.6-PKGVER-ABINUM-FLAVOUR
>  Depends: linux-image-PKGVER-ABINUM-FLAVOUR
>  Pre-Depends: dpkg (>= 1.10.24)
>  Description: compat-wireless Linux modules for version PKGVER on DESC
> @@ -54,6 +56,7 @@ Architecture: ARCH
>  Section: SECTION_IMAGE
>  Priority: optional
>  Provides: =PROVIDES=
> +Conflicts:linux-backports-modules-cw-3.3-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.4-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.6-PKGVER-ABINUM-FLAVOUR
>  Depends: linux-image-PKGVER-ABINUM-FLAVOUR
>  Pre-Depends: dpkg (>= 1.10.24)
>  Description: compat-wireless Linux modules for version PKGVER on DESC
> @@ -69,6 +72,7 @@ Architecture: ARCH
>  Section: SECTION_IMAGE
>  Priority: optional
>  Provides: =PROVIDES=
> +Conflicts:linux-backports-modules-cw-3.3-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.4-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.5-PKGVER-ABINUM-FLAVOUR
>  Depends: linux-image-PKGVER-ABINUM-FLAVOUR
>  Pre-Depends: dpkg (>= 1.10.24)
>  Description: compat-wireless Linux modules for version PKGVER on DESC
Tim Gardner - Oct. 19, 2012, 7:53 p.m.

Patch

diff --git a/debian/control.d/flavour-control.stub b/debian/control.d/flavour-control.stub
index 029d653..d644989 100644
--- a/debian/control.d/flavour-control.stub
+++ b/debian/control.d/flavour-control.stub
@@ -24,6 +24,7 @@  Architecture: ARCH
 Section: SECTION_IMAGE
 Priority: optional
 Provides: =PROVIDES=
+Conflicts:linux-backports-modules-cw-3.4-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.5-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.6-PKGVER-ABINUM-FLAVOUR
 Depends: linux-image-PKGVER-ABINUM-FLAVOUR
 Pre-Depends: dpkg (>= 1.10.24)
 Description: compat-wireless Linux modules for version PKGVER on DESC
@@ -39,6 +40,7 @@  Architecture: ARCH
 Section: SECTION_IMAGE
 Priority: optional
 Provides: =PROVIDES=
+Conflicts:linux-backports-modules-cw-3.3-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.5-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.6-PKGVER-ABINUM-FLAVOUR
 Depends: linux-image-PKGVER-ABINUM-FLAVOUR
 Pre-Depends: dpkg (>= 1.10.24)
 Description: compat-wireless Linux modules for version PKGVER on DESC
@@ -54,6 +56,7 @@  Architecture: ARCH
 Section: SECTION_IMAGE
 Priority: optional
 Provides: =PROVIDES=
+Conflicts:linux-backports-modules-cw-3.3-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.4-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.6-PKGVER-ABINUM-FLAVOUR
 Depends: linux-image-PKGVER-ABINUM-FLAVOUR
 Pre-Depends: dpkg (>= 1.10.24)
 Description: compat-wireless Linux modules for version PKGVER on DESC
@@ -69,6 +72,7 @@  Architecture: ARCH
 Section: SECTION_IMAGE
 Priority: optional
 Provides: =PROVIDES=
+Conflicts:linux-backports-modules-cw-3.3-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.4-PKGVER-ABINUM-FLAVOUR, linux-backports-modules-cw-3.5-PKGVER-ABINUM-FLAVOUR
 Depends: linux-image-PKGVER-ABINUM-FLAVOUR
 Pre-Depends: dpkg (>= 1.10.24)
 Description: compat-wireless Linux modules for version PKGVER on DESC