X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=cbb4a5b343d9c863a0f03ac7100f54b0421624c1;hb=3d58403e62b7b2de32f76c7bdd6224325ab333bc;hp=eeb32e07994136c0f637a32d4ab95d5713f0e8f2;hpb=e0aa1c6880f5423adfa9fa024f31990331041c67;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index eeb32e0..cbb4a5b 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)
@@ -142,7 +142,7 @@ autogen-stamp: patch-stamp
 # modules, whereas the modules build omits the utilities, to create two
 # neatly separated debian files.
 #
-# Note: KERNEL_SRC, KERNEL_CFG, ZFS_SRC and SPL_SRC need to be set from the
+# Note: KERNEL_SRC, KERNEL_OBJ, ZFS_SRC and SPL_SRC need to be set from the
 # outside. This is done by "make debs". As such, invoking "debuild" or such
 # direct debian build tools will lead to a client-only build.
 configure: configure-stamp
@@ -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 --disable-modules"; \
+		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,14 +186,28 @@ 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 \
 			--with-linux=$${KERNEL_SRC} \
-			--with-linux-config=$${KERNEL_CFG} \
+			--with-linux-obj=$${KERNEL_OBJ} \
 			--disable-snmp \
 			--enable-quota \
 			$${EXTRAFLAGS} \
+			$(EXTRA_OPTIONS) \
 	); \
 	touch $@
 
@@ -449,6 +477,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) \
@@ -458,7 +494,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)