From 713fa2b1854f77d59e46f24f91248ac443fd575d Mon Sep 17 00:00:00 2001 From: dann frazier Date: Thu, 28 Oct 2010 16:24:35 -0400 Subject: [PATCH 4/4] Add packaging goo for fusion driver --- debian/control.d/flavour-control.stub | 14 ++++++++++++++ debian/rules.d/2-binary-arch.mk | 14 ++++++++++++++ updates/Makefile | 1 + 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/debian/control.d/flavour-control.stub b/debian/control.d/flavour-control.stub index 5b6375c..28e58c6 100644 --- a/debian/control.d/flavour-control.stub +++ b/debian/control.d/flavour-control.stub @@ -85,6 +85,20 @@ Description: Ubuntu supplied Linux modules for version PKGVER on DESC. the linux-backports-modules-wwan-POCKET-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. +Package: linux-backports-modules-fusion-PKGVER-ABINUM-FLAVOUR +Architecture: ARCH +Section: SECTION_IMAGE +Priority: optional +Provides: +Depends: linux-image-PKGVER-ABINUM-FLAVOUR +Pre-Depends: dpkg (>= 1.10.24) +Description: Ubuntu supplied Linux modules for version PKGVER on DESC. + This package contains fusion modules supplied by Ubuntu for Linux PKGVER. + . + You likely do not want to install this package directly. Instead, install + the linux-backports-modules-fusion-POCKET-FLAVOUR meta-package, which will ensure that + upgrades work correctly, and that supporting packages are also installed. + #Package: linux-backports-modules-nouveau-PKGVER-ABINUM-FLAVOUR #Architecture: ARCH #Section: SECTION_IMAGE diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 25f3a1b..899c34d 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -90,6 +90,9 @@ install-%: cspkgdir = $(CURDIR)/debian/linux-backports-modules-alsa-$(release)-$ install-%: csmoddir = $(cspkgdir)/lib/modules/$(release)-$(abinum)-$* install-%: nvpkgdir = $(CURDIR)/debian/linux-backports-modules-nouveau-$(release)-$(abinum)-$* install-%: nvmoddir = $(nvpkgdir)/lib/modules/$(release)-$(abinum)-$* +install-%: fuspkgdir = $(CURDIR)/debian/linux-backports-modules-fusion-$(release)-$(abinum)-$* +install-%: fusmoddir = $(fuspkgdir)/lib/modules/$(release)-$(abinum)-$* +install-%: fussrcdir = $(CURDIR)/updates/fusion install-%: lbmbasehdrpkg = linux-headers-lbm-$(release)$(debnum) install-%: lbmhdrpkg = $(lbmbasehdrpkg)-$* install-%: hdrdir = $(CURDIR)/debian/$(lbmhdrpkg)/usr/src/$(lbmhdrpkg) @@ -187,6 +190,16 @@ endif install -d $(wwpkgdir)/DEBIAN # + # Build the fusion-drivers packages. + # + install -d $(fusmoddir)/updates/fusion + find $(builddir)/build-*/fusion -type f -name '*.ko' | \ + while read f; do \ + install -v $$f $(fusmoddir)/updates/fusion/; \ + strip --strip-debug $(fusmoddir)/updates/fusion/$$(basename $$f); \ + done + + # # Hack to make the udev rule and firmware loader specific to the # package. # @@ -241,6 +254,7 @@ ifeq ($(do_nouveau_package),true) package_list += linux-backports-modules-nouveau-$(release)-$(abinum)-$* endif package_list += linux-backports-modules-wwan-$(release)-$(abinum)-$* +package_list += linux-backports-modules-fusion-$(release)-$(abinum)-$* binary-modules-%: install-% dh_testdir diff --git a/updates/Makefile b/updates/Makefile index 7ab46a7..555eef8 100644 --- a/updates/Makefile +++ b/updates/Makefile @@ -13,3 +13,4 @@ KBUILD_EXTMOD := $(src)/alsa-driver obj-y += wireless-staging/ obj-y += thinkpad-acpi/ obj-y += wwan-drivers/ +obj-y += fusion/ -- 1.7.0.4