[Pkg-lustre-svn-commit] updated: [3f28bcb] Add a suggest to ofa-kernel-source and link against a ofa-kernel-headers dir if available

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 3f28bcba0b085b5b80a8417b55aaf95e80703e6e
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Jun 23 11:29:57 2010 +0200

    Add a suggest to ofa-kernel-source and link against a ofa-kernel-headers dir if available
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/control b/debian/control
index e5a7ee7..7faaa93 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Package: lustre-source
 Section: kernel
 Architecture: all
 Depends: module-assistant, bzip2, debhelper (>= 5.0.0), libsnmp-dev, dpatch, ${misc:Depends}
+Suggests: ofa-kernel-source
 Description: source for Lustre filesystem client kernel modules
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  It is maintained by Cluster Filesystems, Inc. and available from 
diff --git a/debian/rules b/debian/rules
index 2643734..1d08fdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -263,10 +263,17 @@ kdist_config: prep-deb-files
 	#  Check build dependencies again, needs to be done since we just
 	# replaced the control file.
 	dpkg-checkbuilddeps
+	# check if a ofa-kernel-header package is installed for current kernel
+	# if yes, link against it:
+	if (test -d /usr/src/ofa-kernel-headers-$(KVERS)); then 
+	    OFA_KERNEL="--with-o2ib=/usr/src/ofa-kernel-headers-$(KVERS)"
+	else
+	    OFA_KERNEL=""
+	fi
 	# touch files to same date, to avoid auto*
 	find . -type f -exec touch -r COPYING {} \;
 	# Doesn't seem possible to only build modules...
-	 ./configure --with-linux=$(KSRC) \
+	 ./configure --with-linux=$(KSRC) $(OFA_KERNEL) \
 		    --disable-quilt  \
 		    --disable-dependency-tracking \
 		    --disable-doc  \

-- 
Lustre Debian Packaging