The following commit has been merged in the master branch:
commit 5cca668a7e5cbaeff6623b46d40415c1c1e59bbe
Author: Patrick Winnertz <win...@debian.org>
Date:   Wed Jun 23 13:23:42 2010 +0200

    further changes for ofa-kernel
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/rules b/debian/rules
index b1bd910..3a1b5e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,12 @@ TOP_DIR:=$(shell pwd)
 VERSION=`cat $(TOP_DIR)/debian/lustre-version`
 SUPPORTED_KERNELS=2.6.18 2.6.22 2.6.24 2.6.26 2.6.27
 UPVERSION=`head -n1 $(TOP_DIR)/debian/changelog | awk '{print $$2}' | sed -e 
's%[()]%%g'`
+OFA_KERNEL=`if [ -d /usr/src/ofa-kernel-headers-$(KVERS) ]; then \
+    echo "--with-o2ib=/usr/src/ofa-kernel-headers-$(KVERS)"; \
+else \
+    echo ""; \
+fi`
+
 
 # Packages
 PATCH_PKG=linux-patch-lustre
@@ -263,13 +269,6 @@ 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 [ -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...

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to