From patchwork Tue Nov 30 20:23:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 73652 X-Patchwork-Delegate: tim.gardner@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id CA8E5B70EF for ; Wed, 1 Dec 2010 07:23:34 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PNWja-00074p-Cn; Tue, 30 Nov 2010 20:23:30 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PNWjY-00074I-RN for kernel-team@lists.ubuntu.com; Tue, 30 Nov 2010 20:23:28 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1PNWjY-0006TG-PC; Tue, 30 Nov 2010 20:23:28 +0000 Received: from 79-71-115-209.dynamic.dsl.as9105.com ([79.71.115.209] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PNWjY-0000Tr-JF; Tue, 30 Nov 2010 20:23:28 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: Add compat-wireless-2.6.36/37 support for generic-pae Date: Tue, 30 Nov 2010 20:23:26 +0000 Message-Id: <1291148607-4444-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1291148607-4444-1-git-send-email-apw@canonical.com> References: <1291148607-4444-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com It seems that when linux-backports-modules-wireless was converted to linux-backports-modules-compat-wireless-2.6.36 that generic-pae was missed from the mix. Add support there. Signed-off-by: Andy Whitcroft --- meta-source/debian/changelog | 8 ++++++++ meta-source/debian/control.d/generic-pae | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog index f1f3db5..c7d8654 100644 --- a/meta-source/debian/changelog +++ b/meta-source/debian/changelog @@ -1,3 +1,11 @@ +linux-meta (2.6.35.23.27) UNRELEASED; urgency=low + + [ Andy Whitcroft ] + + * Add compat-wireless-2.6.36/37 support for generic-pae. + + -- Andy Whitcroft Fri, 26 Nov 2010 14:33:46 +0000 + linux-meta (2.6.35.23.26) maverick-proposed; urgency=low [ Leann Ogasawara ] diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae index c735ebc..c95f1b2 100644 --- a/meta-source/debian/control.d/generic-pae +++ b/meta-source/debian/control.d/generic-pae @@ -60,6 +60,22 @@ Description: Backported input drivers for generic-pae kernel image This empty package allows people to keep their backported input modules up-to-date when upgrading their Linux kernel. +Package: linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-generic-pae +Architecture: amd64 i386 +Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae +#Conflicts: linux-backports-modules-compat-wireless-2.6.37-RELEASE_NAME-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 +#Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.37-${kernel-abi-version}-generic-pae +#Conflicts: linux-backports-modules-compat-wireless-2.6.36-RELEASE_NAME-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-media-RELEASE_NAME-generic-pae Architecture: i386 Depends: ${misc:Depends}, linux-backports-modules-media-${kernel-abi-version}-generic-pae