From nobody Sun Feb 8 13:13:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1594895131; cv=none; d=zohomail.com; s=zohoarc; b=RM9rXll/bXW0jHC67cgRACQMFqelgsXPLAH42LhrxpgbqxZrz4rEXRKg6Gh/loWHA8n4gt9TYJ27h8ZtPHQ7aVXyNOwbXzn+AcegkCoLFTCN77pzdqxYoeeeE9a8Z/HOYkuA8y9pbr27FLmmdNai8qT+gd7dK8owSBGkKz7oLyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895131; h=Content-Type:Content-Transfer-Encoding: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; bh=ArYMBrZDu9CbbtRoETAKZKELunSlGFnr91uarZVMHe4=; b=OQFDDgC4I61D23upJ2QGhwKdXKhr/rHrTD6gHoRoW6MPH+2jmv3PG/wvooWapLKqcSOKu79C2S2+RmhUZ2C03ptmsLZWxS9z39nrl2UHq6M0PLaRlhLsw3PE30/APRgq8FVFvYN3xpoZJXHqBVy8uYK7B0bnBGQ3uCfv6tVXR1Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594895131934507.3442609389117; Thu, 16 Jul 2020 03:25:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-71aZcu8hNEqSPYgmsRu5rA-1; Thu, 16 Jul 2020 06:14:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCB1B1888AA7; Thu, 16 Jul 2020 10:14:00 +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 A9B9A6FEFF; Thu, 16 Jul 2020 10:14:00 +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 7740F180530A; Thu, 16 Jul 2020 10:14:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA6Qd8019596 for ; Thu, 16 Jul 2020 06:06:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id E203A2B6DB; Thu, 16 Jul 2020 10:06:26 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DDE62B6E6 for ; Thu, 16 Jul 2020 10:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895130; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ArYMBrZDu9CbbtRoETAKZKELunSlGFnr91uarZVMHe4=; b=NbEG06wpBUziDw4vHMrqKL7zDjybuAc/b2lMta4LZrVB7S2JPf6TK7QDGetpVpRL2ORuiO iuisc79T+KAPhAOhT94irU036ZTIFZHkKqUcK8A5WtF9zR29KeqI1YKLvHFGWwTz5DNH4F JrLXEae1Zfd8bHXPV2+tJ1SH79I4EZ0= X-MC-Unique: 71aZcu8hNEqSPYgmsRu5rA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 267/351] meson: tools: generate libvirt-guests.service systemd unit Date: Thu, 16 Jul 2020 11:58:23 +0200 Message-Id: <3e4a4d19614137582af509fa6728ba7bc41b7045.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- tools/Makefile.am | 34 ++-------------------------------- tools/meson.build | 9 +++++++++ 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 9c6c6b3d3c9..ba3b0bbc120 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,42 +23,12 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 noinst_LTLIBRARIES =3D =20 -install-data-local: install-systemd install-nss \ +install-data-local: install-nss \ install-bash-completion =20 -uninstall-local: uninstall-systemd uninstall-nss \ +uninstall-local: uninstall-nss \ uninstall-bash-completion =20 -SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system - -if LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - -uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - -else ! LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: -uninstall-systemd: -endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD - -libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.s= tatus - $(AM_V_GEN)sed \ - -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \ - -e 's|[@]bindir[@]|$(bindir)|g' \ - -e 's|[@]localedir[@]|$(localedir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]libexecdir[@]|$(libexecdir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - - if WITH_BASH_COMPLETION install-bash-completion: $(MKDIR_P) "$(DESTDIR)$(BASH_COMPLETIONS_DIR)" diff --git a/tools/meson.build b/tools/meson.build index b95ced3728b..ce8f2bdd1e3 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -222,6 +222,7 @@ tools_conf =3D configuration_data() tools_conf.set('PACKAGE', meson.project_name()) tools_conf.set('VERSION', meson.project_version()) tools_conf.set('bindir', bindir) +tools_conf.set('libexecdir', libexecdir) tools_conf.set('localedir', localedir) tools_conf.set('localstatedir', localstatedir) tools_conf.set('sbindir', sbindir) @@ -268,4 +269,12 @@ if init_script =3D=3D 'systemd' install_dir: sysconfdir / 'sysconfig', rename: 'libvirt-guests', ) + + configure_file( + input: 'libvirt-guests.service.in', + output: 'libvirt-guests.service', + configuration: tools_conf, + install: true, + install_dir: prefix / 'lib' / 'systemd' / 'system', + ) endif --=20 2.26.2