From nobody Wed May 14 18:33:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519227337656204.95547753854748; Wed, 21 Feb 2018 07:35:37 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD59210F3EC; Wed, 21 Feb 2018 15:35:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F8185C20C; Wed, 21 Feb 2018 15:35:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A3FAC4A46D; Wed, 21 Feb 2018 15:35:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1LFZWXx020912 for ; Wed, 21 Feb 2018 10:35:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7B4D410A9717; Wed, 21 Feb 2018 15:35:32 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9BE310A9711; Wed, 21 Feb 2018 15:35:31 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 21 Feb 2018 15:35:16 +0000 Message-Id: <20180221153525.14973-2-berrange@redhat.com> In-Reply-To: <20180221153525.14973-1-berrange@redhat.com> References: <20180221153525.14973-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/10] src: simplify systemd unit file handling in make rules X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 21 Feb 2018 15:35:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Remove lots of duplication in the systemd unit file handling, so we can add more unit files without modifying so many places. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 50 +++++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 38fa1e3393..3e6fb6c244 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2796,16 +2796,20 @@ MANINFILES =3D \ CLEANFILES +=3D test_virtlockd.aug test_virtlogd.aug $(man8_MANS) MAINTAINERCLEANFILES +=3D $(MANINFILES) =20 +SYSTEMD_UNIT_FILES_IN =3D \ + locking/virtlockd.service.in \ + locking/virtlockd.socket.in \ + locking/virtlockd-admin.socket.in \ + logging/virtlogd.service.in \ + logging/virtlogd.socket.in \ + logging/virtlogd-admin.socket.in \ + $(NULL) + EXTRA_DIST +=3D \ - locking/virtlockd.service.in \ - locking/virtlockd.socket.in \ - locking/virtlockd-admin.socket.in \ + $(SYSTEMD_UNIT_FILES_IN) \ locking/virtlockd.aug \ locking/virtlockd.conf \ locking/test_virtlockd.aug.in \ - logging/virtlogd.service.in \ - logging/virtlogd.socket.in \ - logging/virtlogd-admin.socket.in \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ @@ -2818,36 +2822,20 @@ if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD =20 SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system +SYSTEMD_UNIT_FILES =3D $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=3D%)) =20 -BUILT_SOURCES +=3D virtlockd.service virtlockd.socket virtlockd-admin.sock= et \ - virtlogd.service virtlogd.socket virtlogd-admin.socket -DISTCLEANFILES +=3D virtlockd.service virtlockd.socket virtlockd-admin.soc= ket \ - virtlogd.service virtlogd.socket virtlogd-admin.socket +BUILT_SOURCES +=3D $(SYSTEMD_UNIT_FILES) +DISTCLEANFILES +=3D $(SYSTEMD_UNIT_FILES) =20 -install-systemd: virtlockd.service virtlockd.socket virtlockd-admin.socket= \ - virtlogd.service virtlogd.socket virtlogd-admin.socket \ - install-sysconfig +install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) virtlockd.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ - $(INSTALL_DATA) virtlockd.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ - $(INSTALL_DATA) virtlockd-admin.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ - $(INSTALL_DATA) virtlogd.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ - $(INSTALL_DATA) virtlogd.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ - $(INSTALL_DATA) virtlogd-admin.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ + for f in $(SYSTEMD_UNIT_FILES); \ + do \ + $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ + done =20 uninstall-systemd: uninstall-sysconfig - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd-admin.socket - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket + rm -f $(SYSTEMD_UNIT_FILES:%=3D$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list