From fd2ea1e91120531322e3206057aafd526d4dfade Mon Sep 17 00:00:00 2001 From: Ake Sandgren Date: Wed, 29 Jan 2025 13:15:37 +0100 Subject: [PATCH] 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 Change-Id: I44aa60fea474ae046ba89a6502ba9b6c635c6918 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57922 Reviewed-by: Timothy Day Reviewed-by: Oleg Drokin Reviewed-by: James Simmons Tested-by: Maloo Tested-by: jenkins --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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}"; \ -- 1.8.3.1