From 1f2b9d798c098173105fac488bdea126132351b1 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Sun, 5 Jun 2022 23:31:43 -0700 Subject: [PATCH] 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: TBD (from d1d5b35306bc164afe444164a40fdd3940a2abcd) 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-on: https://review.whamcloud.com/47537 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Andreas Dilger --- debian/rules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/rules b/debian/rules index 16fca26..1b7a113 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}; \ -- 1.8.3.1