X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=3a689e5ba7cb59553b8e704449efa6b27ba69484;hb=137f42678f9bed9328d59ab62f1ecc70b26209a1;hp=dbae25706e5b3edd3d0114fc5d34ca95580699fe;hpb=befb09ba10f6b801021ec563e976f21fd68cd8e7;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index dbae257..3a689e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -158,8 +158,22 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "server"; then \
 		export EXTRAFLAGS="--enable-server"; \
+		if echo "$${DEB_BUILD_PROFILES}" | grep -q "systemd"; then \
+			cp debian/lustre-server-utils.install.in \
+				debian/lustre-server-utils.install; \
+		else \
+			sed /systemd/d debian/lustre-server-utils.install.in \
+				> debian/lustre-server-utils.install; \
+		fi; \
 	else \
 		export EXTRAFLAGS="--disable-server"; \
+		if echo "$${DEB_BUILD_PROFILES}" | grep -q "systemd"; then \
+			cp debian/lustre-client-utils.install.in \
+				debian/lustre-client-utils.install; \
+		else \
+			sed /systemd/d debian/lustre-client-utils.install.in \
+				> debian/lustre-client-utils.install; \
+		fi; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "zfs"; then \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --with-zfs=$${ZFS_SRC} --with-spl=$${SPL_SRC}"; \
@@ -172,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 \
@@ -455,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) \