From: Sebastien Buisson Date: Thu, 2 Jun 2022 10:05:02 +0000 (+0200) Subject: LU-15908 build: fix debian rules X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F47512%2F1;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 Signed-off-by: Sebastien Buisson Change-Id: I0894199301c489b1961e043651c74d7c6c0089d2 --- diff --git a/debian/rules b/debian/rules index df80c07..3b2a478 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 "/ac_cv_env/d" "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \ @@ -493,8 +491,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 "/ac_cv_env/d" "$${CONFIG_CACHE_FILE}" > $${TMP_CACHE_FILE}; \