From 02b097440db37fe5e8054f983f8382dfa85f8e25 Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Wed, 28 Nov 2018 10:23:06 -0500 Subject: [PATCH] LU-11575 build: install systemd stuff only for debian with systemd enabled Add a precheck for systemd, to avoid to try to package systemd stuff intolustre-client/server-utils deb when building on debian series without systemd supported. Test-Parameters: clientdistro=ubuntu1604 trivial Change-Id: If58b64acc035e621594ab420a8b900b18a34a211 Signed-off-by: Gu Zheng Reviewed-on: https://review.whamcloud.com/33492 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Li Dongyang Reviewed-by: Nathaniel Clark Reviewed-by: Oleg Drokin --- autoMakefile.am | 3 +++ ...client-utils.install => lustre-client-utils.install.in} | 0 ...server-utils.install => lustre-server-utils.install.in} | 0 debian/rules | 14 ++++++++++++++ 4 files changed, 17 insertions(+) rename debian/{lustre-client-utils.install => lustre-client-utils.install.in} (100%) rename debian/{lustre-server-utils.install => lustre-server-utils.install.in} (100%) diff --git a/autoMakefile.am b/autoMakefile.am index d39d16a..92a3c4c 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -259,6 +259,9 @@ debs: undef.h elif test "x@ENABLE_GSS@" = "xno"; then \ export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \ fi; \ + if test "x@systemdsystemunitdir@" != "x"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} systemd"; \ + fi; \ export KERNEL_OBJ="$(LINUX_OBJ)"; \ export KERNEL_SRC="$(LINUX)"; \ echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \ diff --git a/debian/lustre-client-utils.install b/debian/lustre-client-utils.install.in similarity index 100% rename from debian/lustre-client-utils.install rename to debian/lustre-client-utils.install.in diff --git a/debian/lustre-server-utils.install b/debian/lustre-server-utils.install.in similarity index 100% rename from debian/lustre-server-utils.install rename to debian/lustre-server-utils.install.in diff --git a/debian/rules b/debian/rules index d7b0ea3..c7546af 100755 --- a/debian/rules +++ b/debian/rules @@ -158,8 +158,22 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}" if echo "$${DEB_BUILD_PROFILES}" | grep -q "server"; then \ export EXTRAFLAGS="--enable-server"; \ + if echo "$${DEB_BUILD_PROFILES}" | grep -q "systemd"; then \ + cp debian/lustre-server-utils.install.in \ + debian/lustre-server-utils.install; \ + else \ + sed /systemd/d debian/lustre-server-utils.install.in \ + > debian/lustre-server-utils.install; \ + fi; \ else \ export EXTRAFLAGS="--disable-server"; \ + if echo "$${DEB_BUILD_PROFILES}" | grep -q "systemd"; then \ + cp debian/lustre-client-utils.install.in \ + debian/lustre-client-utils.install; \ + else \ + sed /systemd/d debian/lustre-client-utils.install.in \ + > debian/lustre-client-utils.install; \ + fi; \ 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