X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=33f7878f5986ddd86ab3bda6fe37f0eff0f2a7da;hb=0732254bc8b7351f1e168c04d5124f16bc762c64;hp=c7546af113dd4320d07faf1737ee60031b2b4e3e;hpb=02b097440db37fe5e8054f983f8382dfa85f8e25;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index c7546af..33f7878 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ UPVERSION=$(shell echo $(VERSION) | sed -e 's/-[^-]*$$//')
 KVER?=$(LINUXRELEASE)
 
 # KVERS, KSRC are the kernel version and source to use when building lustre
-# Will be the default when building lustre-utils, etc but whatever module-assistant
+# Will be the default when building lustre-{server,client}-utils, etc but whatever module-assistant
 # supplied when building modules
 KVERS?=$(KVER)
 KSRC?=$(LINUX_OBJ)
@@ -186,6 +186,9 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	else \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-ldiskfs"; \
 	fi; \
+	if echo "$${DEB_BUILD_PROFILES}" | grep -q "o2ib"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --with-o2ib=$${O2IB_SRC}"; \
+	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -qw "gss"; then \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --enable-gss"; \
 	elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nogss"; then \
@@ -199,6 +202,7 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 			--disable-snmp \
 			--enable-quota \
 			$${EXTRAFLAGS} \
+			$(EXTRA_OPTIONS) \
 	); \
 	touch $@
 
@@ -468,6 +472,9 @@ kdist_config: prep-deb-files patch-stamp
 		export EXTRAFLAGS="$${EXTRAFLAGS} \
 			--disable-ldiskfs --disable-quilt"; \
 	fi; \
+	if echo "$${DEB_BUILD_PROFILES}" | grep -q "o2ib"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --with-o2ib=$${O2IB_SRC}"; \
+	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
 	./configure --with-linux=$(KSRC_TREE) \
 		--with-linux-obj=$(KSRC) \
@@ -477,7 +484,7 @@ kdist_config: prep-deb-files patch-stamp
 		--disable-snmp \
 		--disable-tests \
 		--enable-quota \
-		--with-kmp-moddir=updates \
+		--with-kmp-moddir=updates/kernel \
 		$${EXTRAFLAGS} \
 		$(EXTRA_OPTIONS)