From nobody Sun Feb 8 05:23:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594894397; cv=none; d=zohomail.com; s=zohoarc; b=ki9FvYpt9xFsfI8nZZE59TE/GQuTI7BKut6ak26tGJBJQzy4/HGVyfcg0JAra+LOMPe7fZIH0DaYlJ3N/6X+w7BNxXMwWLF3hDnGEkdzhBD6V4GvVGAi45wBg/BfDr9mMZiXAWYXw3cu4R+J0/HQ/sJvFxIJgjnt008bEveWYw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894397; 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=Jp3P0xBOKPOp+Ur+TVaJRwUCR1XoK9Df2aG3JPdLzJo=; b=XV+u4J/8vulpT4wwHiy3ogYOqnid/RojPz8U42KJCkluAAIwsdfLBhlc5RIJlmEQeDb+Qv0jtSgwSw87+ZdWp9xF/JxAAH59aEZSjJuyJ/ar0kXg6zx8uRpzxn2IwwwSDvgEIKUeSsFWUwfrom9iPUWl3V4aqftVqI2MbeMTle8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894397934647.8340114719019; Thu, 16 Jul 2020 03:13:17 -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-503-LxucRsazOq6IFu51hGSNyQ-1; Thu, 16 Jul 2020 06:09:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B7BAC1888AB8; Thu, 16 Jul 2020 10:09:43 +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 9B242710D7; Thu, 16 Jul 2020 10:09:43 +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 6C8C59624A; Thu, 16 Jul 2020 10:09:43 +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 06GA5f2C018624 for ; Thu, 16 Jul 2020 06:05:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD0E62B6DC; Thu, 16 Jul 2020 10:05:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37DEC2B6DB for ; Thu, 16 Jul 2020 10:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894396; 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=Jp3P0xBOKPOp+Ur+TVaJRwUCR1XoK9Df2aG3JPdLzJo=; b=TWBjdDVpUQIgh4H8WtTvze/yFxs/CXcpEW4qDpyBfPi93RKUOpXbAwxK8Nmu+3GlFw3Hh3 E/p/UlG2R43QuxP7E9P3lPisNviVM7CeXM6nOx1XuCRZ5VvTSzSy/reQeQZDqdSaPri1ff aZtQehdb3DFNwNcSNQWMkM/UKMU/HQ0= X-MC-Unique: LxucRsazOq6IFu51hGSNyQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 223/351] meson: src: install libvirt daemon conf and augeas files Date: Thu, 16 Jul 2020 11:57:39 +0200 Message-Id: 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.15 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 --- src/Makefile.am | 2 -- src/admin/Makefile.inc.am | 2 -- src/admin/meson.build | 2 ++ src/bhyve/Makefile.inc.am | 2 -- src/bhyve/meson.build | 3 +++ src/libxl/Makefile.inc.am | 2 -- src/libxl/meson.build | 3 +++ src/locking/Makefile.inc.am | 27 ---------------------- src/locking/meson.build | 45 +++++++++++++++++++++++++++++++++++++ src/logging/Makefile.inc.am | 3 --- src/logging/meson.build | 3 +++ src/lxc/Makefile.inc.am | 3 --- src/lxc/meson.build | 3 +++ src/meson.build | 2 ++ src/qemu/Makefile.inc.am | 3 --- src/qemu/meson.build | 3 +++ 16 files changed, 64 insertions(+), 44 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 471ebae2b79..9693a2e1aea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,8 +69,6 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am =20 =20 -conf_DATA +=3D libvirt.conf - # .libs/libvirt.so is built by libtool as a side-effect of the Makefile # rule for libvirt.la. However, checking symbols relies on Linux ELF layo= ut if WITH_LINUX diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index bdaed14cd19..ec084299b85 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -2,8 +2,6 @@ =20 ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms =20 -conf_DATA +=3D admin/libvirt-admin.conf - if WITH_LINUX check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \ diff --git a/src/admin/meson.build b/src/admin/meson.build index 3522d789a00..c9dff4d92a0 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -92,4 +92,6 @@ admin_driver_lib =3D static_library( =20 libvirt_libs +=3D admin_driver_lib =20 +virt_conf_files +=3D files('libvirt-admin.conf') + admin_inc_dir =3D include_directories('.') diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index ab681685b2b..9583580ab02 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -31,8 +31,6 @@ bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \ > $@ || rm -f $@ =20 -conf_DATA +=3D bhyve/bhyve.conf -augeas_DATA +=3D bhyve/libvirtd_bhyve.aug augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug =20 bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 5807d67591a..9380ec3313f 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -43,4 +43,7 @@ if conf.has('WITH_BHYVE') '-DMODULE_NAME=3D"bhyve"' ], } + + virt_conf_files +=3D files('bhyve.conf') + virt_aug_files +=3D files('libvirtd_bhyve.aug') endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 051b6c55bd9..021bf4b8d51 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -71,8 +71,6 @@ libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \ > $@ || rm -f $@ =20 -conf_DATA +=3D libxl/libxl.conf -augeas_DATA +=3D libxl/libvirtd_libxl.aug augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug =20 libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \ diff --git a/src/libxl/meson.build b/src/libxl/meson.build index fc5864a090c..0415a0c4a71 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -44,4 +44,7 @@ if conf.has('WITH_LIBXL') '-DMODULE_NAME=3D"libxl"', ], } + + virt_conf_files +=3D files('libxl.conf') + virt_aug_files +=3D files('libvirtd_libxl.aug') endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index b4fb9387a17..0826472cfca 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -20,34 +20,15 @@ OPENRC_INIT_FILES_IN +=3D \ $(NULL) =20 if WITH_LIBVIRTD -augeas_DATA +=3D locking/libvirt_lockd.aug - if WITH_QEMU augeastest_DATA +=3D locking/test_libvirt_lockd.aug -nodist_conf_DATA +=3D locking/qemu-lockd.conf endif WITH_QEMU - -if WITH_LIBXL -nodist_conf_DATA +=3D locking/libxl-lockd.conf -endif WITH_LIBXL - if WITH_SANLOCK -augeas_DATA +=3D locking/libvirt_sanlock.aug - if WITH_QEMU augeastest_DATA +=3D locking/test_libvirt_sanlock.aug -nodist_conf_DATA +=3D locking/qemu-sanlock.conf endif WITH_QEMU - -if WITH_LIBXL -nodist_conf_DATA +=3D locking/libxl-sanlock.conf -endif WITH_LIBXL - endif WITH_SANLOCK =20 -conf_DATA +=3D locking/virtlockd.conf - -augeas_DATA +=3D locking/virtlockd.aug augeastest_DATA +=3D locking/test_virtlockd.aug =20 INSTALL_DATA_DIRS +=3D locking @@ -94,14 +75,6 @@ endif WITH_LIBVIRTD uninstall-data-locking \ $(NULL) =20 -locking/%-lockd.conf: $(srcdir)/locking/lockd.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - -locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - =20 virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/locking/meson.build b/src/locking/meson.build index 0e48c86afc9..9e09c96f67b 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -145,4 +145,49 @@ if conf.has('WITH_LIBVIRTD') ], } endif + + virt_aug_files +=3D files('libvirt_lockd.aug') + + if conf.has('WITH_QEMU') + qemu_lockd_conf =3D configure_file( + input: 'lockd.conf', + output: 'qemu-lockd.conf', + copy: true, + ) + virt_conf_files +=3D qemu_lockd_conf + endif + + if conf.has('WITH_LIBXL') + libxl_lockd_conf =3D configure_file( + input: 'lockd.conf', + output: 'libxl-lockd.conf', + copy: true, + ) + virt_conf_files +=3D libxl_lockd_conf + endif + + if conf.has('WITH_SANLOCK') + virt_aug_files +=3D files('libvirt_sanlock.aug') + + if conf.has('WITH_QEMU') + qemu_sanlock_conf =3D configure_file( + input: 'sanlock.conf', + output: 'qemu-sanlock.conf', + copy: true, + ) + virt_conf_files +=3D qemu_sanlock_conf + endif + + if conf.has('WITH_LIBXL') + libxl_sanlock_conf =3D configure_file( + input: 'sanlock.conf', + output: 'libxl-sanlock.conf', + copy: true, + ) + virt_conf_files +=3D libxl_sanlock_conf + endif + endif + + virt_conf_files +=3D files('virtlockd.conf') + virt_aug_files +=3D files('virtlockd.aug') endif diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 8adec645d36..1ae0078e434 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -19,9 +19,6 @@ OPENRC_INIT_FILES_IN +=3D \ $(NULL) =20 if WITH_LIBVIRTD -conf_DATA +=3D logging/virtlogd.conf - -augeas_DATA +=3D logging/virtlogd.aug augeastest_DATA +=3D logging/test_virtlogd.aug =20 logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \ diff --git a/src/logging/meson.build b/src/logging/meson.build index 0e58bc9e6bd..9594646c81f 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -69,4 +69,7 @@ if conf.has('WITH_LIBVIRTD') include_directories('.'), ], } + + virt_conf_files +=3D files('virtlogd.conf') + virt_aug_files +=3D files('virtlogd.aug') endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 03f03ba13db..aea70f37a87 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -77,9 +77,6 @@ if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif =20 -conf_DATA +=3D lxc/lxc.conf - -augeas_DATA +=3D lxc/libvirtd_lxc.aug augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug =20 lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index cf1f976573a..7295510c62b 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -128,4 +128,7 @@ if conf.has('WITH_LXC') xdr_dep, ], } + + virt_conf_files +=3D files('lxc.conf') + virt_aug_files +=3D files('libvirtd_lxc.aug') endif diff --git a/src/meson.build b/src/meson.build index 3a44cd9d663..f19870d2c18 100644 --- a/src/meson.build +++ b/src/meson.build @@ -577,6 +577,8 @@ endforeach =20 # Generate daemon config, augeas and augeas test files =20 +virt_conf_files +=3D 'libvirt.conf' + install_data(virt_conf_files, install_dir: confdir) install_data(virt_aug_files, install_dir: virt_aug_dir) =20 diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 80555d79a40..5817e1266f3 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -66,9 +66,6 @@ qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \ > $@ || rm -f $@ =20 -conf_DATA +=3D qemu/qemu.conf - -augeas_DATA +=3D qemu/libvirtd_qemu.aug augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug =20 qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ diff --git a/src/qemu/meson.build b/src/qemu/meson.build index fca7cf1658f..680ca2189a6 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -118,6 +118,9 @@ if conf.has('WITH_QEMU') ], } =20 + virt_conf_files +=3D files('qemu.conf') + virt_aug_files +=3D files('libvirtd_qemu.aug') + virt_helpers +=3D { 'name': 'virt-qemu-run', 'sources': [ --=20 2.26.2