Whamcloud - gitweb
LU-11575 build: install systemd stuff only for debian with systemd enabled 92/33492/4
authorGu Zheng <gzheng@ddn.com>
Wed, 28 Nov 2018 15:23:06 +0000 (10:23 -0500)
committerOleg Drokin <green@whamcloud.com>
Fri, 4 Jan 2019 04:47:19 +0000 (04:47 +0000)
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 <gzheng@ddn.com>
Reviewed-on: https://review.whamcloud.com/33492
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
autoMakefile.am
debian/lustre-client-utils.install.in [moved from debian/lustre-client-utils.install with 100% similarity]
debian/lustre-server-utils.install.in [moved from debian/lustre-server-utils.install with 100% similarity]
debian/rules

index d39d16a..92a3c4c 100644 (file)
@@ -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}"; \
index d7b0ea3..c7546af 100755 (executable)
@@ -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}"; \