Patchwork [Oneiric,linux-meta,1/1] UBUNTU: Re-enable linux-backports-modules

login
register
mail settings
Submitter Leann Ogasawara
Date Oct. 6, 2011, 3:59 p.m.
Message ID <1317916779.2260.12.camel@adamo>
Download mbox | patch
Permalink /patch/118117/
State New
Headers show

Comments

Leann Ogasawara - Oct. 6, 2011, 3:59 p.m.
BugLink: http://bugs.launchpad.net/bugs/869224

== SRU Justification ==

Earlier in the dev cycle we temporarily disabled linux-backports-modules
(specifically the headers package) as it did not yet exist.  Now that it
does exist in the archive, re-enable it.  Without it, we see a
component mismatch in the archive:

http://people.canonical.com/~ubuntu-archive/component-mismatches.txt

From bb9793f47857353ed6b4cf76e587db5a009a2a1c Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Thu, 6 Oct 2011 06:48:07 -0700
Subject: [PATCH] UBUNTU: Re-enable linux-backports-modules

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

Earlier in the dev cycle we temporarily disabled linux-backports-modules
as it did not yet exist.  Now that it does exist in the archive,
re-enable it.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 meta-source/debian/control.d/generic     |   14 +++++++-------
 meta-source/debian/control.d/generic-pae |   14 +++++++-------
 meta-source/debian/control.d/server      |   14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)
Tim Gardner - Oct. 6, 2011, 4:21 p.m.
On 10/06/2011 09:59 AM, Leann Ogasawara wrote:
> BugLink: http://bugs.launchpad.net/bugs/869224
>
> == SRU Justification ==
>
> Earlier in the dev cycle we temporarily disabled linux-backports-modules
> (specifically the headers package) as it did not yet exist.  Now that it
> does exist in the archive, re-enable it.  Without it, we see a
> component mismatch in the archive:
>
> http://people.canonical.com/~ubuntu-archive/component-mismatches.txt
>
>  From bb9793f47857353ed6b4cf76e587db5a009a2a1c Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara<leann.ogasawara@canonical.com>
> Date: Thu, 6 Oct 2011 06:48:07 -0700
> Subject: [PATCH] UBUNTU: Re-enable linux-backports-modules
>
> BugLink: http://bugs.launchpad.net/bugs/869224
>
> Earlier in the dev cycle we temporarily disabled linux-backports-modules
> as it did not yet exist.  Now that it does exist in the archive,
> re-enable it.
>
> Signed-off-by: Leann Ogasawara<leann.ogasawara@canonical.com>
> ---
>   meta-source/debian/control.d/generic     |   14 +++++++-------
>   meta-source/debian/control.d/generic-pae |   14 +++++++-------
>   meta-source/debian/control.d/server      |   14 +++++++-------
>   3 files changed, 21 insertions(+), 21 deletions(-)
>
> diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
> index e46b461..a581440 100644
> --- a/meta-source/debian/control.d/generic
> +++ b/meta-source/debian/control.d/generic
> @@ -25,13 +25,13 @@ Description: Complete Generic Linux kernel
>    This package will always depend on the latest complete generic Linux kernel
>    available.
>
> -#Package: linux-backports-modules-headers-RELEASE_NAME-generic
> -#Architecture: amd64 i386
> -#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
> -#Description: Backported driver headers for generic kernel image
> -# This empty package allows people to keep their backported module
> -# headers up-to-date when upgrading their Linux kernel.
> -#
> +Package: linux-backports-modules-headers-RELEASE_NAME-generic
> +Architecture: amd64 i386
> +Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
> +Description: Backported driver headers for generic kernel image
> + This empty package allows people to keep their backported module
> + headers up-to-date when upgrading their Linux kernel.
> +
>   #Package: linux-backports-modules-alsa-RELEASE_NAME-generic
>   #Architecture: amd64 i386
>   #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
> diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
> index 5360ca5..ed80e08 100644
> --- a/meta-source/debian/control.d/generic-pae
> +++ b/meta-source/debian/control.d/generic-pae
> @@ -25,13 +25,13 @@ Description: Complete Generic Linux kernel
>    This package will always depend on the latest complete generic Linux kernel
>    available.
>
> -#Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
> -#Architecture: i386
> -#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
> -#Description: Backported driver headers for generic-pae kernel image
> -# This empty package allows people to keep their backported module
> -# headers up-to-date when upgrading their Linux kernel.
> -#
> +Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
> +Architecture: i386
> +Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
> +Description: Backported driver headers for generic-pae kernel image
> + This empty package allows people to keep their backported module
> + headers up-to-date when upgrading their Linux kernel.
> +
>   #Package: linux-backports-modules-alsa-RELEASE_NAME-generic-pae
>   #Architecture: i386
>   #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
> diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
> index 5023c75..f4cce76 100644
> --- a/meta-source/debian/control.d/server
> +++ b/meta-source/debian/control.d/server
> @@ -25,13 +25,13 @@ Description: Complete Linux kernel on Server Equipment.
>    This package will always depend on the latest complete Linux kernel available
>    for Server Equipment.
>
> -#Package: linux-backports-modules-headers-RELEASE_NAME-server
> -#Architecture: amd64
> -#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
> -#Description: Backported driver headers for server kernel image
> -# This empty package allows people to keep their backported module
> -# headers up-to-date when upgrading their Linux kernel.
> -#
> +Package: linux-backports-modules-headers-RELEASE_NAME-server
> +Architecture: amd64
> +Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
> +Description: Backported driver headers for server kernel image
> + This empty package allows people to keep their backported module
> + headers up-to-date when upgrading their Linux kernel.
> +
>   #Package: linux-backports-modules-alsa-RELEASE_NAME-server
>   #Architecture: amd64
>   #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-server
Leann Ogasawara - Oct. 6, 2011, 5:57 p.m.
Applied to Oneiric linux-meta master.

Thanks,
Leann

On Thu, 2011-10-06 at 08:59 -0700, Leann Ogasawara wrote:
> BugLink: http://bugs.launchpad.net/bugs/869224
> 
> == SRU Justification ==
> 
> Earlier in the dev cycle we temporarily disabled linux-backports-modules
> (specifically the headers package) as it did not yet exist.  Now that it
> does exist in the archive, re-enable it.  Without it, we see a
> component mismatch in the archive:
> 
> http://people.canonical.com/~ubuntu-archive/component-mismatches.txt
> 
> From bb9793f47857353ed6b4cf76e587db5a009a2a1c Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara@canonical.com>
> Date: Thu, 6 Oct 2011 06:48:07 -0700
> Subject: [PATCH] UBUNTU: Re-enable linux-backports-modules
> 
> BugLink: http://bugs.launchpad.net/bugs/869224
> 
> Earlier in the dev cycle we temporarily disabled linux-backports-modules
> as it did not yet exist.  Now that it does exist in the archive,
> re-enable it.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  meta-source/debian/control.d/generic     |   14 +++++++-------
>  meta-source/debian/control.d/generic-pae |   14 +++++++-------
>  meta-source/debian/control.d/server      |   14 +++++++-------
>  3 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
> index e46b461..a581440 100644
> --- a/meta-source/debian/control.d/generic
> +++ b/meta-source/debian/control.d/generic
> @@ -25,13 +25,13 @@ Description: Complete Generic Linux kernel
>   This package will always depend on the latest complete generic Linux kernel
>   available.
>  
> -#Package: linux-backports-modules-headers-RELEASE_NAME-generic
> -#Architecture: amd64 i386
> -#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
> -#Description: Backported driver headers for generic kernel image
> -# This empty package allows people to keep their backported module
> -# headers up-to-date when upgrading their Linux kernel.
> -#
> +Package: linux-backports-modules-headers-RELEASE_NAME-generic
> +Architecture: amd64 i386
> +Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
> +Description: Backported driver headers for generic kernel image
> + This empty package allows people to keep their backported module
> + headers up-to-date when upgrading their Linux kernel.
> +
>  #Package: linux-backports-modules-alsa-RELEASE_NAME-generic
>  #Architecture: amd64 i386
>  #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
> diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
> index 5360ca5..ed80e08 100644
> --- a/meta-source/debian/control.d/generic-pae
> +++ b/meta-source/debian/control.d/generic-pae
> @@ -25,13 +25,13 @@ Description: Complete Generic Linux kernel
>   This package will always depend on the latest complete generic Linux kernel
>   available.
>  
> -#Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
> -#Architecture: i386
> -#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
> -#Description: Backported driver headers for generic-pae kernel image
> -# This empty package allows people to keep their backported module
> -# headers up-to-date when upgrading their Linux kernel.
> -#
> +Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
> +Architecture: i386
> +Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
> +Description: Backported driver headers for generic-pae kernel image
> + This empty package allows people to keep their backported module
> + headers up-to-date when upgrading their Linux kernel.
> +
>  #Package: linux-backports-modules-alsa-RELEASE_NAME-generic-pae
>  #Architecture: i386
>  #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
> diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
> index 5023c75..f4cce76 100644
> --- a/meta-source/debian/control.d/server
> +++ b/meta-source/debian/control.d/server
> @@ -25,13 +25,13 @@ Description: Complete Linux kernel on Server Equipment.
>   This package will always depend on the latest complete Linux kernel available
>   for Server Equipment.
>  
> -#Package: linux-backports-modules-headers-RELEASE_NAME-server
> -#Architecture: amd64
> -#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
> -#Description: Backported driver headers for server kernel image
> -# This empty package allows people to keep their backported module
> -# headers up-to-date when upgrading their Linux kernel.
> -#
> +Package: linux-backports-modules-headers-RELEASE_NAME-server
> +Architecture: amd64
> +Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
> +Description: Backported driver headers for server kernel image
> + This empty package allows people to keep their backported module
> + headers up-to-date when upgrading their Linux kernel.
> +
>  #Package: linux-backports-modules-alsa-RELEASE_NAME-server
>  #Architecture: amd64
>  #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-server
> -- 
> 1.7.4.1
> 
> 
> 
>

Patch

diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
index e46b461..a581440 100644
--- a/meta-source/debian/control.d/generic
+++ b/meta-source/debian/control.d/generic
@@ -25,13 +25,13 @@  Description: Complete Generic Linux kernel
  This package will always depend on the latest complete generic Linux kernel
  available.
 
-#Package: linux-backports-modules-headers-RELEASE_NAME-generic
-#Architecture: amd64 i386
-#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
-#Description: Backported driver headers for generic kernel image
-# This empty package allows people to keep their backported module
-# headers up-to-date when upgrading their Linux kernel.
-#
+Package: linux-backports-modules-headers-RELEASE_NAME-generic
+Architecture: amd64 i386
+Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
+Description: Backported driver headers for generic kernel image
+ This empty package allows people to keep their backported module
+ headers up-to-date when upgrading their Linux kernel.
+
 #Package: linux-backports-modules-alsa-RELEASE_NAME-generic
 #Architecture: amd64 i386
 #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
index 5360ca5..ed80e08 100644
--- a/meta-source/debian/control.d/generic-pae
+++ b/meta-source/debian/control.d/generic-pae
@@ -25,13 +25,13 @@  Description: Complete Generic Linux kernel
  This package will always depend on the latest complete generic Linux kernel
  available.
 
-#Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
-#Architecture: i386
-#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
-#Description: Backported driver headers for generic-pae kernel image
-# This empty package allows people to keep their backported module
-# headers up-to-date when upgrading their Linux kernel.
-#
+Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
+Architecture: i386
+Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
+Description: Backported driver headers for generic-pae kernel image
+ This empty package allows people to keep their backported module
+ headers up-to-date when upgrading their Linux kernel.
+
 #Package: linux-backports-modules-alsa-RELEASE_NAME-generic-pae
 #Architecture: i386
 #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index 5023c75..f4cce76 100644
--- a/meta-source/debian/control.d/server
+++ b/meta-source/debian/control.d/server
@@ -25,13 +25,13 @@  Description: Complete Linux kernel on Server Equipment.
  This package will always depend on the latest complete Linux kernel available
  for Server Equipment.
 
-#Package: linux-backports-modules-headers-RELEASE_NAME-server
-#Architecture: amd64
-#Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
-#Description: Backported driver headers for server kernel image
-# This empty package allows people to keep their backported module
-# headers up-to-date when upgrading their Linux kernel.
-#
+Package: linux-backports-modules-headers-RELEASE_NAME-server
+Architecture: amd64
+Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
+Description: Backported driver headers for server kernel image
+ This empty package allows people to keep their backported module
+ headers up-to-date when upgrading their Linux kernel.
+
 #Package: linux-backports-modules-alsa-RELEASE_NAME-server
 #Architecture: amd64
 #Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-server