X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=262ea47c2fab20e7832b7ef3b1969f29cd016556;hb=3a88442dfffc451b0c598a95d49896e6ba271304;hp=d7b0ea32a1998a127fdb76a28d7ade3ad7514507;hpb=f785fcaa7b7fe600bd29efe0ce509beea7ac2095;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index d7b0ea3..262ea47 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)
@@ -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,11 +186,19 @@ 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 \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-gss"; \
 	fi; \
+	if echo "$${DEB_BUILD_PROFILES}" | grep -qw "crypto"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --enable-crypto"; \
+	elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nocrypto"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-crypto"; \
+	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
 	( cd $(BUILDDIR) && \
 		$(SRCDIR)/configure --disable-dependency-tracking \
@@ -185,6 +207,7 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 			--disable-snmp \
 			--enable-quota \
 			$${EXTRAFLAGS} \
+			$(EXTRA_OPTIONS) \
 	); \
 	touch $@
 
@@ -229,6 +252,7 @@ binary-$(UTILS_PKG): build-stamp
 	       debian/$(UTILS_PKG)/usr/bin/*-survey \
 	       debian/$(UTILS_PKG)/usr/bin/mcreate \
 	       debian/$(UTILS_PKG)/usr/bin/munlink \
+	       debian/$(UTILS_PKG)/usr/bin/statx \
 	       debian/$(UTILS_PKG)/usr/sbin/wirecheck \
 	       debian/$(UTILS_PKG)/usr/sbin/wiretest
 	dh_makeshlibs -p $(UTILS_PKG)
@@ -454,6 +478,14 @@ 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; \
+	if echo "$${DEB_BUILD_PROFILES}" | grep -qw "crypto"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --enable-crypto"; \
+	elif echo "$${DEB_BUILD_PROFILES}" | grep -qw "nocrypto"; then \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-crypto"; \
+	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
 	./configure --with-linux=$(KSRC_TREE) \
 		--with-linux-obj=$(KSRC) \
@@ -463,7 +495,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)