From patchwork Fri Apr 19 15:56:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 238046 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 6B3B02C016B for ; Sat, 20 Apr 2013 01:57:14 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UTDgN-0003Re-Pl; Fri, 19 Apr 2013 15:57:03 +0000 Received: from mail.tpi.com ([70.99.223.143]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UTDgL-0003NQ-Pb for kernel-team@lists.ubuntu.com; Fri, 19 Apr 2013 15:57:01 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 0ABEA3399F9; Fri, 19 Apr 2013 08:57:00 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id B9FA622C4D; Fri, 19 Apr 2013 09:56:59 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Precise LBM 1/2] UBUNTU: Add version specific firmware delivery mechanism Date: Fri, 19 Apr 2013 09:56:50 -0600 Message-Id: <1366387011-16846-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1170739 The udev rules for finding firmware are already uniquely tied to an ABI number. Now we provide a way to deliver firmware that is consumed by the compat wireless drivers. Signed-off-by: Tim Gardner Signed-off-by: Tim Gardner Acked-by: Leann Ogasawara Acked-by: Leann Ogasawara --- debian/rules.d/2-binary-arch.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 2a09134..185bc9f 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -121,7 +121,8 @@ ifneq ($(CWDIRS),) cwpkgdir=$(CURDIR)/debian/linux-backports-modules-$${cw}-$(release)-$(abinum)-$(target_flavour); \ cwblddir=$(builddir)/build-$(target_flavour)/$${cw}; \ cwmoddir=$${cwpkgdir}/lib/modules/$(release)-$(abinum)-$(target_flavour)/updates; \ - firmdir=$${cwpkgdir}/lib/firmware/updates/$(release)-$(abinum)-$(target_flavour); \ + dstfirmdir=$${cwpkgdir}/lib/firmware/updates/$(release)-$(abinum)-$(target_flavour); \ + srcfirmdir=$(CURDIR)/updates/$${cw}-firmware; \ \ dh_clean -k -plinux-backports-modules-$${cw}-$(release)-$(abinum)-$(target_flavour); \ \ @@ -144,8 +145,9 @@ ifneq ($(CWDIRS),) install -d $${cwpkgdir}/lib/udev/rules.d; \ install --mode=0644 $${cwblddir}/udev/ubuntu/50-compat_firmware_$(abinum)_$(target_flavour).rules $${cwpkgdir}/lib/udev/rules.d; \ \ - install -d $${firmdir}; \ - if [ -d firmware/iwlwifi ] ; then cp firmware/iwlwifi/*/*.ucode $${firmdir}/; fi; \ + install -d $${dstfirmdir}; \ + echo $${srcfirmdir} $${dstfirmdir}; \ + if [ -d $${srcfirmdir} ] ; then cp -rv $${srcfirmdir}/* $${dstfirmdir}; fi; \ done endif