X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=447ff78715f3fcd44511a05518627dcb0edbbd9c;hb=refs%2Fchanges%2F37%2F45137%2F4;hp=33f7878f5986ddd86ab3bda6fe37f0eff0f2a7da;hpb=8d7f2674337e4f22e200e08ca1ac001ec24b4496;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index 33f7878..447ff78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -194,6 +194,18 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	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; \
+	# remove env variables from config cache built by initial configure,
+	# and create dedicated cache in temporary build directory
+	if [ -f "$${CONFIG_CACHE_FILE}" ]; then \
+		export TMP_CACHE_FILE=$$(mktemp); \
+		sed "/ac_cv_env/d" "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --cache-file=$${TMP_CACHE_FILE}"; \
+	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
 	( cd $(BUILDDIR) && \
 		$(SRCDIR)/configure --disable-dependency-tracking \
@@ -247,6 +259,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)
@@ -475,6 +488,18 @@ kdist_config: prep-deb-files patch-stamp
 	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; \
+	# remove env variables from config cache built by initial configure,
+	# and create dedicated cache in temporary build directory
+	if [ -f "$${CONFIG_CACHE_FILE}" ]; then \
+		export TMP_CACHE_FILE=$$(mktemp --tmpdir newconfig-XXXXXXXX.cache); \
+		sed "/ac_cv_env/d" "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --cache-file=$${TMP_CACHE_FILE}"; \
+	fi; \
 	echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \
 	./configure --with-linux=$(KSRC_TREE) \
 		--with-linux-obj=$(KSRC) \