From: Sebastien Buisson Date: Fri, 24 Jun 2022 04:43:11 +0000 (-0700) Subject: LU-15908 build: fix debian rules X-Git-Tag: 2.15.1-RC1~21 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6e957d1ec6d7ea26e7e051cc3186df1a56b3c6c2 LU-15908 build: fix debian rules A comment in debian/rules file breaks a commands-line continuation, causing exported env vars to be dropped. Lustre-change: https://review.whamcloud.com/47512 Lustre-commit: 81fde14387e0b352ea8211fa74cec37171ea08fb Fixes: a5084c2f2e ("LU-14937 build: re-use config cache in 'make rpms/debs'") Test-Parameters: trivial Signed-off-by: Ake Sandgren Signed-off-by: Sebastien Buisson Change-Id: I0894199301c489b1961e043651c74d7c6c0089d2 Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu Reviewed-on: https://review.whamcloud.com/47671 Tested-by: jenkins Tested-by: Maloo --- 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" \