From patchwork Fri Jul 2 17:24:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 57702 X-Patchwork-Delegate: steve.conklin@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 D12041007D2 for ; Sat, 3 Jul 2010 03:24:52 +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 1OUjyj-0002LZ-PQ; Fri, 02 Jul 2010 18:24:41 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OUjyg-0002Ea-Gz for kernel-team@lists.ubuntu.com; Fri, 02 Jul 2010 18:24:38 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id 97FE913ABF; Fri, 2 Jul 2010 10:23:48 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id 23942F88D3; Fri, 2 Jul 2010 11:24:35 -0600 (MDT) To: stefan.bader@canonical.com Subject: Lucid SRU, LBM pull request, LP535132, compat_firmware.sh conflict Message-Id: <20100702172436.23942F88D3@sepang.rtg.net> Date: Fri, 2 Jul 2010 11:24:35 -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 3b3855df43601103a5d1c17703efafdae676d996: Steve Conklin (1): UBUNTU: Bump ABI are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-lucid-lbm lp535132-compat-wireless Tim Gardner (1): UBUNTU: Make udev firmware helper file name unique by ABI and flavour debian/rules.d/2-binary-arch.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) From 5b570a2c740daf84d3b590c5f226ae5976c00dcd Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Fri, 2 Jul 2010 11:03:22 -0600 Subject: [PATCH] UBUNTU: Make udev firmware helper file name unique by ABI and flavour Buglink: http://bugs.launchpad.net/bugs/535132 /lib/udev/compat_firmware.sh is delivered in the linux-backports-modules-wireless-2.6.32-24 binary package. However, it _should_ have been delivered in an architecture independent package. (my bad) Therefore, make the file name and firmware class unique by ABI _and_ flavour. This builds on some previous gross hackery in commit 63d418f41c427e416b06b321c4ffcec0fae7100b 'UBUNTU: Make compat wireless udev glue unique by ABI'. If a little gross hackery is good, then a bit more must be better. Signed-off-by: Tim Gardner --- debian/rules.d/2-binary-arch.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 4dce885..ce6207f 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -37,12 +37,12 @@ $(stampdir)/stamp-prepare-%: $(confdir)/$(arch) 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' \ + sed -i 's/compat_firmware/compat_firmware_'$(abinum)_$(target_flavour)'/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 + mv $(cw)/udev/ubuntu/50-compat_firmware.rules $(cw)/udev/ubuntu/50-compat_firmware_$(abinum)_$(target_flavour).rules + mv $(cw)/udev/ubuntu/compat_firmware.sh $(cw)/udev/ubuntu/compat_firmware_$(abinum)_$(target_flavour).sh ifeq ($(do_nouveau_package),true) $(builddir)/build-$*/MUNGE-NOUVEAU echo "obj-y += nouveau/" >>$(builddir)/build-$*/Makefile @@ -120,9 +120,9 @@ install-%: $(stampdir)/stamp-build-% # the compat_firmware_class has its own rules. # install -d $(cwpkgdir)/lib/udev - install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum).sh $(cwpkgdir)/lib/udev + install --mode=0755 $(cwblddir)/udev/ubuntu/compat_firmware_$(abinum)_$(target_flavour).sh $(cwpkgdir)/lib/udev install -d $(cwpkgdir)/lib/udev/rules.d - install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum).rules $(cwpkgdir)/lib/udev/rules.d + install --mode=0644 $(cwblddir)/udev/ubuntu/50-compat_firmware_$(abinum)_$(target_flavour).rules $(cwpkgdir)/lib/udev/rules.d # # Build the ALSA snapshot packages.