From: Sebastien Buisson <sbuisson@ddn.com>
Date: Thu, 2 Jun 2022 10:05:02 +0000 (+0200)
Subject: LU-15908 build: fix debian rules
X-Git-Tag: 2.15.51~122
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=81fde14387e0b352ea8211fa74cec37171ea08fb;p=fs%2Flustre-release.git

LU-15908 build: fix debian rules

A comment in debian/rules file breaks a commands-line continuation,
causing exported env vars to be dropped.

Fixes: a5084c2f2e ("LU-14937 build: re-use config cache in 'make rpms/debs'")
Test-Parameters: trivial
Signed-off-by: Ake Sandgren <ake.sandgren@hpc2n.umu.se>
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I0894199301c489b1961e043651c74d7c6c0089d2
Reviewed-on: https://review.whamcloud.com/47512
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/debian/rules b/debian/rules
index dce9dc6..ab0d36e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -199,8 +199,6 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 	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 -e "/ac_cv_env/d" \
@@ -497,8 +495,6 @@ kdist_config: prep-deb-files patch-stamp
 	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 -e "/ac_cv_env/d" \