From patchwork Thu Apr 29 15:54:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 51299 X-Patchwork-Delegate: apw@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 272FAB7D2B for ; Fri, 30 Apr 2010 01:54:24 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O7W48-0003Rp-Oy; Thu, 29 Apr 2010 16:54:16 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O7W45-0003Ql-1T for kernel-team@lists.ubuntu.com; Thu, 29 Apr 2010 16:54:13 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id 3A83C20E849; Thu, 29 Apr 2010 08:53:14 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id A5AA6F899A; Thu, 29 Apr 2010 09:54:00 -0600 (MDT) To: apw@canonical.com Subject: Lucid LBM pull request, SRU #568782 Message-Id: <20100429155400.A5AA6F899A@sepang.rtg.net> Date: Thu, 29 Apr 2010 09:54:00 -0600 (MDT) From: timg@tpi.com (Tim Gardner) Cc: kernel-team@lists.ubuntu.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 The following changes since commit 7610a4fd7ecf96d7ecbadde92d9e3511e8ca0929: Andy Whitcroft (1): UBUNTU: Lucid ABI 22 are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-lucid-lbm lp568782 Tim Gardner (1): UBUNTU: Make compat wireless udev glue unique by ABI debian/changelog | 2 +- debian/rules.d/2-binary-arch.mk | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) From 99d36d771562de092d23f921aa3451c55797cf82 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 29 Apr 2010 15:53:45 +0100 Subject: [PATCH] UBUNTU: Make compat wireless udev glue unique by ABI BugLink: http://bugs.launchpad.net/bugs/568782 Compat wireless installs a udev helper to load wireless driver firmware. Since these files collide between LBM packages, rename them to be unique using the ABI number. Signed-off-by: Tim Gardner Acked-by: Andy Whitcroft Acked-by: Stefan Bader --- debian/changelog | 2 +- debian/rules.d/2-binary-arch.mk | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e949d6..dda638b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-backports-modules-2.6.32 (2.6.32-22.12) UNRELEASED; urgency=low +linux-backports-modules-2.6.32 (2.6.32-21.12) UNRELEASED; urgency=low CHANGELOG: Do not edit directly. Autogenerated at release. CHANGELOG: Use the printchanges target to see the curent changes. diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index e369c44..9c611ea 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -30,10 +30,16 @@ endif prepare-%: $(stampdir)/stamp-prepare-% @# Empty for make to be happy $(stampdir)/stamp-prepare-%: target_flavour = $* +$(stampdir)/stamp-prepare-%: cw = $(builddir)/build-$*/compat-wireless-2.6 $(stampdir)/stamp-prepare-%: $(confdir)/$(arch) @echo "Preparing $*..." install -d $(builddir)/build-$* cd updates; tar cf - * | tar -C $(builddir)/build-$* -xf - + # Gross hackery to make the compat firmware class unique to this ABI + sed -i 's/compat_firmware/compat_firmware_'$(abinum)'/g' $(cw)/compat/compat_firmware_class.c $(cw)/compat/scripts/compat_firmware_install \ + $(cw)/udev/ubuntu/50-compat_firmware.rules + mv $(cw)/udev/ubuntu/50-compat_firmware.rules $(cw)/udev/ubuntu/50-compat_firmware_$(abinum).rules + mv $(cw)/udev/ubuntu/compat_firmware.sh $(cw)/udev/ubuntu/compat_firmware_$(abinum).sh ifeq ($(do_nouveau_package),true) $(builddir)/build-$*/MUNGE-NOUVEAU echo "obj-y += nouveau/" >>$(builddir)/build-$*/Makefile @@ -59,6 +65,7 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-% # Install the finished build install-%: cwpkgdir = $(CURDIR)/debian/linux-backports-modules-wireless-$(release)-$(abinum)-$* +install-%: cwblddir = $(builddir)/build-$*/compat-wireless-2.6 install-%: cwmoddir = $(cwpkgdir)/lib/modules/$(release)-$(abinum)-$* install-%: cwsrcdir = $(CURDIR)/updates/compat-wireless-2.6 install-%: cspkgdir = $(CURDIR)/debian/linux-backports-modules-alsa-$(release)-$(abinum)-$* @@ -107,9 +114,9 @@ install-%: $(stampdir)/stamp-build-% # the compat_firmware_class has its own rules. # install -d $(cwpkgdir)/lib/udev - install --mode=0755 $(cwsrcdir)/udev/ubuntu/compat_firmware.sh $(cwpkgdir)/lib/udev + install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum).sh $(cwpkgdir)/lib/udev install -d $(cwpkgdir)/lib/udev/rules.d - install --mode=0644 $(cwsrcdir)/udev/ubuntu/50-compat_firmware.rules $(cwpkgdir)/lib/udev/rules.d + install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum).rules $(cwpkgdir)/lib/udev/rules.d # # Build the ALSA snapshot packages.