X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=70cc1d8bf0910dfe37998cea9b1627a6586c55e3;hb=02e0adddf474091a182e0721febb969564b6398b;hp=bef0c49eed1419090f90bd45d4b3cb184303263d;hpb=f8babafc6ac2cae22e6005103aaa5ac4aa0a63ea;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index bef0c49..70cc1d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ endif
 #CC?=gcc-3.3
 #export CC
 
-# This is the debhelper compatability version to use.
+# This is the debhelper compatibility version to use.
 export DH_COMPAT=7
 
 # Module-assistant stuff
@@ -54,6 +54,7 @@ KVER?=$(LINUXRELEASE)
 KVERS?=$(KVER)
 KSRC?=$(LINUX_OBJ)
 KSRC_TREE?=$(LINUX)
+IB_OPTIONS?=""
 
 # Packages
 PATCH_PKG=linux-patch-lustre
@@ -112,7 +113,6 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	if [ "$(BUILDDIR)" != "." ]; then \
 		mkdir -p $(BUILDDIR)/build $(BUILDDIR)/lustre/contrib; \
 		cp build/Makefile $(BUILDDIR)/build/; \
-		cp lustre/contrib/mpich-*.patch $(BUILDDIR)/lustre/contrib/; \
 	fi
 	( cd $(BUILDDIR) && \
 	 $(SRCDIR)/configure --disable-dependency-tracking \
@@ -344,7 +344,9 @@ kdist_config: prep-deb-files patch-stamp
 		    --disable-iokit \
 		    --disable-snmp \
 		    --disable-tests \
-		    --enable-quota
+		    --enable-quota \
+		    --with-kmp-moddir=updates \
+		    $(IB_OPTIONS)
 
 kdist_configure: kdist_config