Maverick linux-meta SRU: Build for correct arches

Tim Gardner timg at tpi.com
Wed Feb 16 16:27:33 UTC 2011


The following changes since commit 98a8830e02e1931cc98096b4e685891be30e74f0:
  Brad Figg (1):
        UBUNTU: Ubuntu-2.6.35.27.34

are available in the git repository at:

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

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

 meta-source/debian/control.d/generic-pae |    7 +++++--
 meta-source/debian/control.d/server      |    3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

>From 3230f49ac596f3c54ea834150d2495193de948fa Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Wed, 16 Feb 2011 09:22:58 -0700
Subject: [PATCH 1/2] 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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
index d596096..f0a551f 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
@@ -61,14 +64,14 @@ Description: Backported input drivers for generic-pae kernel image
  up-to-date when upgrading their Linux kernel.
 
 Package: linux-backports-modules-compat-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-compat-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
-- 
1.7.0.4


>From 0f4d1bcd93dfb4f6fe64692324cc23c27e6c6509 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Wed, 16 Feb 2011 09:23:45 -0700
Subject: [PATCH 2/2] 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 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index e871876..f527fe4 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
-- 
1.7.0.4





More information about the kernel-team mailing list