From nobody Mon Feb 9 13:00:44 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1564420330; cv=none; d=zoho.com; s=zohoarc; b=M9m5bCAVbCOLFxcDZ16QqbhDA5zxCTr2NmSEw+q/KA4Zz5ovLfhSGGMkKJlhMwYtnfkCWhrypaI/L1H+yD6ha3E11qrb5fjvYNAn7nSwsEeQ2J/KsWzwClhJmqF73XadXRLYj0bflVa+TTZwNvCv7KsuvVExJwB+3GEAwwdYDrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564420330; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KSLMA17gy7Em63LjRTgKOC647Ve5r5Q8kVSp1XaEAVI=; b=bRR1NDCozvHpi5a1SX+rlm9hvYqdaVXBFEOMeatsvACRj34zuZuZ9Z/QmytHKoJ328+EyZk8KBmaygD49YdxiLVa+5ZiK08stySsvZyFSg22vKGohpKzsn3gw/UWUFWPVG90YiGaYtgSWdM9XcKnMToPRR16fhv4hXTz5pS3uB4= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1564420330599148.6841827809801; Mon, 29 Jul 2019 10:12:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 58A15A96E9; Mon, 29 Jul 2019 17:12:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E32E10013A1; Mon, 29 Jul 2019 17:12:09 +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 DEC17180BA9E; Mon, 29 Jul 2019 17:12:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6THC31O027657 for ; Mon, 29 Jul 2019 13:12:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D8245C21F; Mon, 29 Jul 2019 17:12:03 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 671025C21A; Mon, 29 Jul 2019 17:12:02 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 29 Jul 2019 18:11:00 +0100 Message-Id: <20190729171130.25484-19-berrange@redhat.com> In-Reply-To: <20190729171130.25484-1-berrange@redhat.com> References: <20190729171130.25484-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH v3 18/48] remote: refactor how list of systemd unit files is built 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 29 Jul 2019 17:12:09 +0000 (UTC) The make logic assumes that the SYSTEMD_UNIT_FILES var can be built from SYSTEMD_UNIT_FILES_IN by simply dropping the directory prefix and the .in suffix. This won't work in future when a single .in unit file can be used to generate multiple different units. Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 2 +- src/locking/Makefile.inc.am | 5 ++++- src/logging/Makefile.inc.am | 5 ++++- src/remote/Makefile.inc.am | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b4544b12a7..5bbd85ecef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,6 +82,7 @@ RPC_PROBE_FILES =3D LOGROTATE_FILES_IN =3D PODFILES =3D MANINFILES =3D +SYSTEMD_UNIT_FILES =3D SYSTEMD_UNIT_FILES_IN =3D SYSCONF_FILES =3D sbin_PROGRAMS =3D @@ -838,7 +839,6 @@ 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 $(SYSTEMD_UNIT_FILES) DISTCLEANFILES +=3D $(SYSTEMD_UNIT_FILES) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index bc1a05549a..37d0e79f40 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -77,12 +77,15 @@ MANINFILES +=3D virtlockd.8.in CLEANFILES +=3D $(man8_MANS) MAINTAINERCLEANFILES +=3D $(MANINFILES) =20 -SYSTEMD_UNIT_FILES_IN +=3D \ +VIRTLOCKD_UNIT_FILES_IN =3D \ locking/virtlockd.service.in \ locking/virtlockd.socket.in \ locking/virtlockd-admin.socket.in \ $(NULL) =20 +SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOCKD_UNIT_FILES_IN:%.in=3D%)) +SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOCKD_UNIT_FILES_IN) + lockdriverdir =3D $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES =3D =20 diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 18772fde2f..b952021d00 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -50,12 +50,15 @@ PODFILES +=3D logging/virtlogd.pod MANINFILES +=3D virtlogd.8.in SYSCONF_FILES +=3D logging/virtlogd.sysconf =20 -SYSTEMD_UNIT_FILES_IN +=3D \ +VIRTLOGD_UNIT_FILES_IN =3D \ logging/virtlogd.service.in \ logging/virtlogd.socket.in \ logging/virtlogd-admin.socket.in \ $(NULL) =20 +SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOGD_UNIT_FILES_IN:%.in=3D%)) +SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOGD_UNIT_FILES_IN) + if WITH_LIBVIRTD sbin_PROGRAMS +=3D virtlogd =20 diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 0e9c0b9e1b..c9c3c7203a 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -89,7 +89,7 @@ SYSCONF_FILES +=3D remote/libvirtd.sysconf PODFILES +=3D remote/libvirtd.pod MANINFILES +=3D libvirtd.8.in =20 -SYSTEMD_UNIT_FILES_IN +=3D \ +LIBVIRTD_UNIT_FILES_IN =3D \ remote/libvirtd.service.in \ remote/libvirtd.socket.in \ remote/libvirtd-ro.socket.in \ @@ -99,6 +99,9 @@ SYSTEMD_UNIT_FILES_IN +=3D \ remote/virt-guest-shutdown.target.in \ $(NULL) =20 +SYSTEMD_UNIT_FILES +=3D $(notdir $(LIBVIRTD_UNIT_FILES_IN:%.in=3D%)) +SYSTEMD_UNIT_FILES_IN +=3D $(LIBVIRTD_UNIT_FILES_IN) + REMOTE_PROTOCOL =3D $(srcdir)/remote/remote_protocol.x LXC_PROTOCOL =3D $(srcdir)/remote/lxc_protocol.x QEMU_PROTOCOL =3D $(srcdir)/remote/qemu_protocol.x --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list