From: Ake Sandgren <ake.sandgren@hpc2n.umu.se>
Date: Wed, 29 Jan 2025 12:15:37 +0000 (+0100)
Subject: LU-18685 deb: fix broken EXTRAFLAGS
X-Git-Tag: 2.16.55~37
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=fd2ea1e91120531322e3206057aafd526d4dfade;p=fs%2Flustre-release.git

LU-18685 deb: fix broken EXTRAFLAGS

A change to allow separate packages to be built has broken handling
of EXTRAFLAGS in debian/rules. It should always use:

 EXTRAFLAGS="${EXTRAFLAGS} ..."

Fixes: 1a2119c54e ("LU-17462 build: make some deb packages optional")
Test-Parameters: trivial
Signed-off-by: Ake Sandgren <ake.sandgren@hpc2n.umu.se>
Change-Id: I44aa60fea474ae046ba89a6502ba9b6c635c6918
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57922
Reviewed-by: Timothy Day <timday@amazon.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
---

diff --git a/debian/rules b/debian/rules
index 090667d..00ba6a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -222,13 +222,13 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
 		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-mpitests" ; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "notests"; then \
-		export EXTRAFLAGS="--disable-tests"; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-tests"; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "noutils"; then \
-		export EXTRAFLAGS="--disable-utils"; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-utils"; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "noiokit"; then \
-		export EXTRAFLAGS="--disable-iokit"; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-iokit"; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "zfs"; then \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --with-zfs=$${ZFS_SRC} --with-spl=$${SPL_SRC}"; \
@@ -553,13 +553,13 @@ kdist_config: prep-deb-files patch-stamp
 		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-mpitests" ; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "notests"; then \
-		export EXTRAFLAGS="--disable-tests"; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-tests"; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "noutils"; then \
-		export EXTRAFLAGS="--disable-utils"; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-utils"; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "noiokit"; then \
-		export EXTRAFLAGS="--disable-iokit"; \
+		export EXTRAFLAGS="$${EXTRAFLAGS} --disable-iokit"; \
 	fi; \
 	if echo "$${DEB_BUILD_PROFILES}" | grep -q "zfs"; then \
 		export EXTRAFLAGS="$${EXTRAFLAGS} --with-zfs=$${ZFS_SRC} --with-spl=$${SPL_SRC}"; \