Lucid linux-meta SRU: Build for correct arches

[Tim Gardner]

The following changes since commit 659068d4db7fdce657dd48a9036eae9eb2178523:
  Tim Gardner (1):
        UBUNTU: Ubuntu-2.6.32.29.34

are available in the git repository at:

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

Tim Gardner (3):
      UBUNTU: LBM generic-pae packages are only built for i386
      UBUNTU: LBM preempt packages are only built for amd64
      UBUNTU: LBM server packages are only built for amd64

 meta-source/debian/control.d/generic-pae |   15 +++++++++------
 meta-source/debian/control.d/preempt     |   15 +++++++++------
 meta-source/debian/control.d/server      |   15 +++++++++------
 3 files changed, 27 insertions(+), 18 deletions(-)

>From 9e459cee0d7ba936bd695c573c115651e189e880 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Wed, 16 Feb 2011 08:59:46 -0700
Subject: [PATCH 1/3] UBUNTU: LBM generic-pae packages are only built for i386

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

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 meta-source/debian/control.d/generic-pae |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
index 11a2a86..5321352 100644
--- a/meta-source/debian/control.d/generic-pae
+++ b/meta-source/debian/control.d/generic-pae
@@ -25,6 +25,9 @@ Description: Complete Generic Linux kernel
  This package will always depend on the latest complete generic Linux kernel
  available.
 
+#
+# LBM generic-pae packages are only built for i386
+#
 Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
 Architecture: i386
 Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
@@ -33,28 +36,28 @@ Description: Backported driver headers for generic-pae kernel image
  headers up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic-pae
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.37-RELEASE_NAME-generic-pae
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-generic-pae
 Description: Backported wireless drivers for generic-pae kernel image
  This empty package allows people to keep their backported wireless modules
@@ -68,14 +71,14 @@ Description: Backported drivers for alsa-driver snapshot.
  up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wwan-RELEASE_NAME-generic-pae
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-wwan-${kernel-abi-version}-generic-pae
 Description: Backported WWAN drivers for generic-pae kernel image
  This empty package allows people to keep their backported WWAN modules
  up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-input-RELEASE_NAME-generic-pae
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${misc:Depends}, linux-backports-modules-input-${kernel-abi-version}-generic-pae
 Description: Backported input drivers for generic-pae kernel image
  This empty package allows people to keep their backported input modules
-- 
1.7.0.4


>From 89d7afaba763e08cb0c0be961d5829064a3d24e3 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Wed, 16 Feb 2011 09:02:22 -0700
Subject: [PATCH 2/3] UBUNTU: LBM preempt packages are only built for amd64

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

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 meta-source/debian/control.d/preempt |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/meta-source/debian/control.d/preempt b/meta-source/debian/control.d/preempt
index bf9bc79..b1bdde8 100644
--- a/meta-source/debian/control.d/preempt
+++ b/meta-source/debian/control.d/preempt
@@ -25,6 +25,9 @@ Description: Complete Linux kernel for Low Latency Servers.
  This package will always depend on the latest complete Linux kernel available
  for Server Equipment.
 
+#
+# LBM preempt packages are only built for amd64
+#
 Package: linux-backports-modules-headers-RELEASE_NAME-preempt
 Architecture: amd64
 Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-preempt
@@ -33,28 +36,28 @@ Description: Backported driver headers for preempt kernel image
  headers up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wireless-RELEASE_NAME-preempt
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.37-RELEASE_NAME-preempt
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-preempt
 Description: Backported wireless drivers for preempt kernel image
  This empty package allows people to keep their backported wireless modules
@@ -68,14 +71,14 @@ Description: Backported drivers for alsa-driver snapshot.
  up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wwan-RELEASE_NAME-preempt
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-wwan-${kernel-abi-version}-preempt
 Description: Backported WWAN drivers for preempt kernel image
  This empty package allows people to keep their backported WWAN modules
  up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-input-RELEASE_NAME-preempt
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-input-${kernel-abi-version}-preempt
 Description: Backported input drivers for preempt kernel image
  This empty package allows people to keep their backported input modules
-- 
1.7.0.4


>From 26dd8a1d6444e21dfb547dc862fb36c6c4027c71 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Wed, 16 Feb 2011 09:03:20 -0700
Subject: [PATCH 3/3] UBUNTU: LBM server packages are only built for amd64

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

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 meta-source/debian/control.d/server |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index a3364a3..edea169 100644
--- a/meta-source/debian/control.d/server
+++ b/meta-source/debian/control.d/server
@@ -25,6 +25,9 @@ Description: Complete Linux kernel on Server Equipment.
  This package will always depend on the latest complete Linux kernel available
  for Server Equipment.
 
+#
+# LBM server packages are only built for amd64
+#
 Package: linux-backports-modules-headers-RELEASE_NAME-server
 Architecture: amd64
 Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
@@ -33,28 +36,28 @@ Description: Backported driver headers for server kernel image
  headers up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wireless-RELEASE_NAME-server
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-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.
 
 Package: linux-backports-modules-wireless-2.6.37-RELEASE_NAME-server
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-server
 Description: Backported wireless drivers for server kernel image
  This empty package allows people to keep their backported wireless modules
@@ -68,14 +71,14 @@ Description: Backported drivers for alsa-driver snapshot.
  up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-wwan-RELEASE_NAME-server
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-wwan-${kernel-abi-version}-server
 Description: Backported WWAN drivers for server kernel image
  This empty package allows people to keep their backported WWAN modules
  up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-input-RELEASE_NAME-server
-Architecture: amd64 i386
+Architecture: amd64
 Depends: ${misc:Depends}, linux-backports-modules-input-${kernel-abi-version}-server
 Description: Backported input drivers for server kernel image
  This empty package allows people to keep their backported input modules
-- 
1.7.0.4