Patchwork Maverick meta SRU, LP681727, linux-backports-modules-wireless-maverick- does not track the correct LBM package

login
register
mail settings
Submitter Tim Gardner
Date Dec. 13, 2010, 9:31 p.m.
Message ID <20101213213147.813FCF8C0E@sepang.rtg.net>
Download mbox
Permalink /patch/75425/
State Accepted
Headers show

Pull-request

git://kernel.ubuntu.com/rtg/ubuntu-maverick-meta.git master

Comments

Tim Gardner - Dec. 13, 2010, 9:31 p.m.
The following changes since commit 2e0c8856014f32644d0d5fed58e232a4ab4c1a2a:
  Leann Ogasawara (1):
        UBUNTU: Remove conflicts statements for compat-wireless meta packages

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-maverick-meta.git master

Tim Gardner (1):
      linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package

 meta-source/debian/control.d/generic     |    2 +-
 meta-source/debian/control.d/generic-pae |    2 +-
 meta-source/debian/control.d/server      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
From 251cb297ff29be68f05892e3c8e62fc03bd93ccb Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Mon, 13 Dec 2010 14:26:02 -0700
Subject: [PATCH] linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package

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

Use $[kernel-abi-version} instead of RELEASE_NAME

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 meta-source/debian/control.d/generic     |    2 +-
 meta-source/debian/control.d/generic-pae |    2 +-
 meta-source/debian/control.d/server      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Stefan Bader - Dec. 14, 2010, 10:42 a.m.
On 12/13/2010 10:31 PM, Tim Gardner wrote:
> The following changes since commit 2e0c8856014f32644d0d5fed58e232a4ab4c1a2a:
>   Leann Ogasawara (1):
>         UBUNTU: Remove conflicts statements for compat-wireless meta packages
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-maverick-meta.git master
> 
> Tim Gardner (1):
>       linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package

Doh!

> 
>  meta-source/debian/control.d/generic     |    2 +-
>  meta-source/debian/control.d/generic-pae |    2 +-
>  meta-source/debian/control.d/server      |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> From 251cb297ff29be68f05892e3c8e62fc03bd93ccb Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Mon, 13 Dec 2010 14:26:02 -0700
> Subject: [PATCH] linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package
> 
> BugLink: http://bugs.launchpad.net/bugs/681727
> 
> Use $[kernel-abi-version} instead of RELEASE_NAME
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  meta-source/debian/control.d/generic     |    2 +-
>  meta-source/debian/control.d/generic-pae |    2 +-
>  meta-source/debian/control.d/server      |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
> index 2a8e4ce..4e37e0f 100644
> --- a/meta-source/debian/control.d/generic
> +++ b/meta-source/debian/control.d/generic
> @@ -34,7 +34,7 @@ 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.36-RELEASE_NAME-generic (= ${binary:Version})
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic (= ${binary:Version})
>  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 3e9eb5f..ecba272 100644
> --- a/meta-source/debian/control.d/generic-pae
> +++ b/meta-source/debian/control.d/generic-pae
> @@ -34,7 +34,7 @@ Description: Backported driver headers for generic-pae kernel image
>  
>  Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
>  Architecture: i386
> -Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae (= ${binary:Version})
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae (= ${binary:Version})
>  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/server b/meta-source/debian/control.d/server
> index d1f84a4..930703e 100644
> --- a/meta-source/debian/control.d/server
> +++ b/meta-source/debian/control.d/server
> @@ -34,7 +34,7 @@ Description: Backported driver headers for server kernel image
>  
>  Package: linux-backports-modules-wireless-RELEASE_NAME-server
>  Architecture: amd64
> -Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-server (= ${binary:Version})
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-server (= ${binary:Version})
>  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.
Brad Figg - Dec. 15, 2010, 4:28 p.m.
On 12/13/2010 01:31 PM, Tim Gardner wrote:
> The following changes since commit 2e0c8856014f32644d0d5fed58e232a4ab4c1a2a:
>    Leann Ogasawara (1):
>          UBUNTU: Remove conflicts statements for compat-wireless meta packages
>
> are available in the git repository at:
>
>    git://kernel.ubuntu.com/rtg/ubuntu-maverick-meta.git master
>
> Tim Gardner (1):
>        linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package
>
>   meta-source/debian/control.d/generic     |    2 +-
>   meta-source/debian/control.d/generic-pae |    2 +-
>   meta-source/debian/control.d/server      |    2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>  From 251cb297ff29be68f05892e3c8e62fc03bd93ccb Mon Sep 17 00:00:00 2001
> From: Tim Gardner<tim.gardner@canonical.com>
> Date: Mon, 13 Dec 2010 14:26:02 -0700
> Subject: [PATCH] linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package
>
> BugLink: http://bugs.launchpad.net/bugs/681727
>
> Use $[kernel-abi-version} instead of RELEASE_NAME
>
> Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
> ---
>   meta-source/debian/control.d/generic     |    2 +-
>   meta-source/debian/control.d/generic-pae |    2 +-
>   meta-source/debian/control.d/server      |    2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
> index 2a8e4ce..4e37e0f 100644
> --- a/meta-source/debian/control.d/generic
> +++ b/meta-source/debian/control.d/generic
> @@ -34,7 +34,7 @@ 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.36-RELEASE_NAME-generic (= ${binary:Version})
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic (= ${binary:Version})
>   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 3e9eb5f..ecba272 100644
> --- a/meta-source/debian/control.d/generic-pae
> +++ b/meta-source/debian/control.d/generic-pae
> @@ -34,7 +34,7 @@ Description: Backported driver headers for generic-pae kernel image
>
>   Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
>   Architecture: i386
> -Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae (= ${binary:Version})
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae (= ${binary:Version})
>   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/server b/meta-source/debian/control.d/server
> index d1f84a4..930703e 100644
> --- a/meta-source/debian/control.d/server
> +++ b/meta-source/debian/control.d/server
> @@ -34,7 +34,7 @@ Description: Backported driver headers for server kernel image
>
>   Package: linux-backports-modules-wireless-RELEASE_NAME-server
>   Architecture: amd64
> -Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-server (= ${binary:Version})
> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-server (= ${binary:Version})
>   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.

Acked-by: Brad Figg<brad.figg@canonical.com>
Tim Gardner - Dec. 15, 2010, 4:32 p.m.
On 12/15/2010 09:28 AM, Brad Figg wrote:
> On 12/13/2010 01:31 PM, Tim Gardner wrote:
>> The following changes since commit 2e0c8856014f32644d0d5fed58e232a4ab4c1a2a:
>>     Leann Ogasawara (1):
>>           UBUNTU: Remove conflicts statements for compat-wireless meta packages
>>
>> are available in the git repository at:
>>
>>     git://kernel.ubuntu.com/rtg/ubuntu-maverick-meta.git master
>>
>> Tim Gardner (1):
>>         linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package
>>
>>    meta-source/debian/control.d/generic     |    2 +-
>>    meta-source/debian/control.d/generic-pae |    2 +-
>>    meta-source/debian/control.d/server      |    2 +-
>>    3 files changed, 3 insertions(+), 3 deletions(-)
>>   From 251cb297ff29be68f05892e3c8e62fc03bd93ccb Mon Sep 17 00:00:00 2001
>> From: Tim Gardner<tim.gardner@canonical.com>
>> Date: Mon, 13 Dec 2010 14:26:02 -0700
>> Subject: [PATCH] linux-backports-modules-wireless-maverick-${flavour} does not track the correct LBM package
>>
>> BugLink: http://bugs.launchpad.net/bugs/681727
>>
>> Use $[kernel-abi-version} instead of RELEASE_NAME
>>
>> Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
>> ---
>>    meta-source/debian/control.d/generic     |    2 +-
>>    meta-source/debian/control.d/generic-pae |    2 +-
>>    meta-source/debian/control.d/server      |    2 +-
>>    3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
>> index 2a8e4ce..4e37e0f 100644
>> --- a/meta-source/debian/control.d/generic
>> +++ b/meta-source/debian/control.d/generic
>> @@ -34,7 +34,7 @@ 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.36-RELEASE_NAME-generic (= ${binary:Version})
>> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic (= ${binary:Version})
>>    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 3e9eb5f..ecba272 100644
>> --- a/meta-source/debian/control.d/generic-pae
>> +++ b/meta-source/debian/control.d/generic-pae
>> @@ -34,7 +34,7 @@ Description: Backported driver headers for generic-pae kernel image
>>
>>    Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
>>    Architecture: i386
>> -Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae (= ${binary:Version})
>> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae (= ${binary:Version})
>>    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/server b/meta-source/debian/control.d/server
>> index d1f84a4..930703e 100644
>> --- a/meta-source/debian/control.d/server
>> +++ b/meta-source/debian/control.d/server
>> @@ -34,7 +34,7 @@ Description: Backported driver headers for server kernel image
>>
>>    Package: linux-backports-modules-wireless-RELEASE_NAME-server
>>    Architecture: amd64
>> -Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-server (= ${binary:Version})
>> +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-server (= ${binary:Version})
>>    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.
>
> Acked-by: Brad Figg<brad.figg@canonical.com>
>

applied and pushed