[Pkg-ofed-commits] r445 - /trunk/ofa-kernel/trunk/debian/

[gmpc-guest at alioth.debian.org]

Author: gmpc-guest
Date: Tue Aug 11 12:16:30 2009
New Revision: 445

URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=445
Log:
Add an ofa-kernel-dev package with the OFED includes + config.
Allows the building of 3rd party kernel modules which depend on
the IB stack without having to keep the module-assistant 
build directory around.

Added:
    trunk/ofa-kernel/trunk/debian/ofa-kernel-dev-_KVERS_.install.modules.in
    trunk/ofa-kernel/trunk/debian/ofa-kernel-modules-_KVERS_.install.modules.in
Modified:
    trunk/ofa-kernel/trunk/debian/changelog
    trunk/ofa-kernel/trunk/debian/control.modules.in
    trunk/ofa-kernel/trunk/debian/rules

Modified: trunk/ofa-kernel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/ofa-kernel/trunk/debian/changelog?rev=445&op=diff
==============================================================================
--- trunk/ofa-kernel/trunk/debian/changelog (original)
+++ trunk/ofa-kernel/trunk/debian/changelog Tue Aug 11 12:16:30 2009
@@ -1,3 +1,11 @@
+ofa-kernel (1.4.2-3) unstable; urgency=low
+
+  * Add an ofa-kernel-dev package so we can build external software
+    without having to keep the m-a build directory around.
+  * Fix the 2.6.22 backport backing-dev.h include file.
+
+ -- Guy Coates <gmpc at sanger.ac.uk>  Tue, 11 Aug 2009 08:53:22 +0100
+
 ofa-kernel (1.4.2-2) unstable; urgency=low
 
   * Disable ipath build on i386.

Modified: trunk/ofa-kernel/trunk/debian/control.modules.in
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/ofa-kernel/trunk/debian/control.modules.in?rev=445&op=diff
==============================================================================
--- trunk/ofa-kernel/trunk/debian/control.modules.in (original)
+++ trunk/ofa-kernel/trunk/debian/control.modules.in Tue Aug 11 12:16:30 2009
@@ -19,3 +19,14 @@
  your own ofa-kernel-modules. The ofa-kernel-source package has been
  provided for use with the Debian's module-assistant or kernel-package
  utilities to produce a version of ofa-kernel-modules for your kernel.
+
+Package: ofa-kernel-dev-_KVERS_
+Architecture: any
+Depends: debconf ofa-kernel-modules-_KVERS_
+Provides: ofa-kernel-dev
+Description: development file for InfiniBand kernel modules (kernel _KVERS_)
+ This package contains the set of include and config  files for
+ the OFED ofa-kernel modules. You will require these files if you
+ wish to build third party kernel modules against the OFED kernel stack. 
+ .
+

Added: trunk/ofa-kernel/trunk/debian/ofa-kernel-dev-_KVERS_.install.modules.in
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/ofa-kernel/trunk/debian/ofa-kernel-dev-_KVERS_.install.modules.in?rev=445&op=file
==============================================================================
--- trunk/ofa-kernel/trunk/debian/ofa-kernel-dev-_KVERS_.install.modules.in (added)
+++ trunk/ofa-kernel/trunk/debian/ofa-kernel-dev-_KVERS_.install.modules.in Tue Aug 11 12:16:30 2009
@@ -1,0 +1,1 @@
+/usr/src

Added: trunk/ofa-kernel/trunk/debian/ofa-kernel-modules-_KVERS_.install.modules.in
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/ofa-kernel/trunk/debian/ofa-kernel-modules-_KVERS_.install.modules.in?rev=445&op=file
==============================================================================
--- trunk/ofa-kernel/trunk/debian/ofa-kernel-modules-_KVERS_.install.modules.in (added)
+++ trunk/ofa-kernel/trunk/debian/ofa-kernel-modules-_KVERS_.install.modules.in Tue Aug 11 12:16:30 2009
@@ -1,0 +1,1 @@
+/lib/modules

Modified: trunk/ofa-kernel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/ofa-kernel/trunk/debian/rules?rev=445&op=diff
==============================================================================
--- trunk/ofa-kernel/trunk/debian/rules (original)
+++ trunk/ofa-kernel/trunk/debian/rules Tue Aug 11 12:16:30 2009
@@ -79,6 +79,7 @@
 	--with-mlx4_en-mod --with-mlx4_inf-mod --with-rds-mod --with-madeye-mod  --with-ipath_inf-mod \
 	--with-qlgc_vnic-mod --with-qlgc_vnic_stats-mod --with-cxgb3-mod --with-nes-mod	--with-nfsrdma-mod
 endif
+
 # ipath_inf-mod does not build on 32bit architectures
 
 ifeq "$(DEB_HOST_ARCH)" "i386"
@@ -125,10 +126,19 @@
 
 	# Build the module
 	$(MAKE) 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/$(PKGNAME) install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	# Move files for the -dev package
+	mkdir -p $(CURDIR)/debian/tmp/usr/src/ofa-kernel-headers-$(KVERS)
+	cp -a include $(CURDIR)/debian/tmp/usr/src/ofa-kernel-headers-$(KVERS)
+	cp -a kernel_addons $(CURDIR)/debian/tmp/usr/src/ofa-kernel-headers-$(KVERS)
+	sed -i -e s,AUTOCONF_H=/usr/src/modules/ofa-kernel,AUTOCONF_H=/usr/src/ofa-kernel-headers-$(KVERS), configure.mk.kernel
+	cp -a configure.mk.kernel $(CURDIR)/debian/tmp/usr/src/ofa-kernel-headers-$(KVERS)
+	cp -a Module.symvers $(CURDIR)/debian/tmp/usr/src/ofa-kernel-headers-$(KVERS)
+	sed -i -e s,$$\{CWD\},/usr/src/ofa-kernel-headers-$(KVERS),g config.mk
+	cp -a config.mk $(CURDIR)/debian/tmp/usr/src/ofa-kernel-headers-$(KVERS)
 
 	# Install the module
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installdocs
 	dh_installchangelogs
 	dh_installdebconf