From: Jian Yu <yujian@whamcloud.com>
Date: Mon, 18 Sep 2023 16:55:37 +0000 (-0700)
Subject: LU-17128 build: fix lnet.service missing issue on Ubuntu 22.04
X-Git-Tag: 2.15.59~104
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F52404%2F3;p=fs%2Flustre-release.git

LU-17128 build: fix lnet.service missing issue on Ubuntu 22.04

The lnet.service file was in the lustre-client-utils package
built on Ubuntu 20.04, but it was missing from the package
built on Ubuntu 22.04.

This is caused by the dpkg-buildpackage change introduced by
dpkg version 1.21.1ubuntu2.1 installed by default on Ubuntu 22.04.
To fix this issue, we need to specify build profiles explicitly
to dpkg-buildpackage via -P|--build-profiles option instead of
just setting the environment variable DEB_BUILD_PROFILES.

Test-Parameters: trivial clientdistro=ubuntu2204

Signed-off-by: Jian Yu <yujian@whamcloud.com>
Change-Id: I9975ef357f0aba722c56d27eaa9b2cfbccc9c524
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52404
Reviewed-by: Colin Faber <cfaber@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/autoMakefile.am b/autoMakefile.am
index 7d92949..500912a 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -455,7 +455,8 @@ debs: undef.h debs_common
 	fi; \
 	sed "s/_KVERS_/$(LINUXRELEASE)/g" debian/lustre-tests.install.in \
 		> debian/lustre-tests.install; \
-	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
+	tmpprofiles=`tr ' ' ',' <<< $$DEB_BUILD_PROFILES`; \
+	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp -P$$tmpprofiles || { \
 		rc=$${PIPESTATUS[0]}; \
 		cp $$debiantmp/control.bkp debian/control || true && \
 		cp $$debiantmp/control.main.bkp debian/control.main || true && \
@@ -511,10 +512,11 @@ dkms-debs: undef.h debs_common
 	export KERNEL_OBJ="$(LINUX_OBJ)"; \
 	export KERNEL_SRC="$(LINUX)"; \
 	echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \
+	tmpprofiles=`tr ' ' ',' <<< $$DEB_BUILD_PROFILES`; \
 	echo "Kernel Source: $${KERNEL_SRC}"; \
 	echo "Kernel Object: $${KERNEL_OBJ}"; \
 	export BUILD_DKMS="true" && \
-	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
+	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp -P$$tmpprofiles || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
 		exit 0; \