From nobody Wed May 14 18:37:34 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 1519227357517186.15907328648996; Wed, 21 Feb 2018 07:35:57 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 375FB15565; Wed, 21 Feb 2018 15:35:56 +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 F10E65D75D; Wed, 21 Feb 2018 15:35:55 +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 B2E07181A881; Wed, 21 Feb 2018 15:35:55 +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 w1LFZdwr020991 for ; Wed, 21 Feb 2018 10:35:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id BEE2D10A9717; Wed, 21 Feb 2018 15:35:39 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 133F310A9711; Wed, 21 Feb 2018 15:35:38 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 21 Feb 2018 15:35:23 +0000 Message-Id: <20180221153525.14973-9-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 08/10] daemon: move configuration files to src/remote 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 21 Feb 2018 15:35:56 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- daemon/Makefile.am | 26 -------------------------- src/Makefile.am | 24 +++++++++++++++++++++++- {daemon =3D> src/remote}/libvirtd.aug | 0 {daemon =3D> src/remote}/libvirtd.conf | 0 {daemon =3D> src/remote}/test_libvirtd.aug.in | 0 5 files changed, 23 insertions(+), 27 deletions(-) rename {daemon =3D> src/remote}/libvirtd.aug (100%) rename {daemon =3D> src/remote}/libvirtd.conf (100%) rename {daemon =3D> src/remote}/test_libvirtd.aug.in (100%) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 70de285667..8bac9a550b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -20,18 +20,15 @@ CLEANFILES =3D =20 DISTCLEANFILES =3D EXTRA_DIST =3D \ - libvirtd.conf \ libvirtd.policy.in \ libvirt.rules \ libvirtd.sasl \ libvirtd.sysctl \ - libvirtd.aug \ libvirtd.logrotate.in \ libvirtd.qemu.logrotate.in \ libvirtd.lxc.logrotate.in \ libvirtd.libxl.logrotate.in \ libvirtd.uml.logrotate.in \ - test_libvirtd.aug.in \ THREADS.txt \ $(NULL) =20 @@ -39,17 +36,6 @@ BUILT_SOURCES =3D =20 if WITH_LIBVIRTD =20 -confdir =3D $(sysconfdir)/libvirt/ -conf_DATA =3D libvirtd.conf - -augeasdir =3D $(datadir)/augeas/lenses -augeas_DATA =3D libvirtd.aug - -augeastestsdir =3D $(datadir)/augeas/lenses/tests -augeastests_DATA =3D test_libvirtd.aug - -CLEANFILES +=3D test_libvirtd.aug - if WITH_POLKIT if WITH_POLKIT0 policydir =3D $(datadir)/PolicyKit/policy @@ -182,18 +168,6 @@ install-sysctl: uninstall-sysctl: endif ! WITH_SYSCTL =20 -check-local: check-augeas - -AUG_GENTEST =3D $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl - -test_libvirtd.aug: test_libvirtd.aug.in $(srcdir)/libvirtd.conf - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libvirtd.conf $< $@ - -check-augeas: test_libvirtd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir) test_libvirtd.aug; \ - fi - else ! WITH_LIBVIRTD install-data-local: install-data-sasl uninstall-local:: uninstall-data-sasl diff --git a/src/Makefile.am b/src/Makefile.am index 8988872ce3..e777fcce09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1370,6 +1370,14 @@ sbin_PROGRAMS +=3D libvirtd =20 BUILT_SOURCES +=3D $(LIBVIRTD_GENERATED) =20 +augeas_DATA +=3D remote/libvirtd.aug + +augeastest_DATA +=3D test_libvirtd.aug + +conf_DATA +=3D remote/libvirtd.conf + +CLEANFILES +=3D tets_libvirtd.aug + libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES) =20 libvirtd_CFLAGS =3D \ @@ -1411,6 +1419,7 @@ libvirtd_LDADD +=3D \ $(NULL) =20 endif WITH_LIBVIRTD +EXTRA_DIST +=3D remote/test_libvirtd.aug.in remote/libvirtd.aug remote/lib= virtd.conf =20 %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ @@ -2149,11 +2158,12 @@ check-local: check-augeas check-augeas-lockd \ check-augeas-libxl \ check-augeas-bhyve \ + check-augeas-libvirtd \ $(NULL) =20 check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock \ check-augeas-lockd check-augeas-virtlockd check-augeas-libxl \ - check-augeas-bhyve check-augeas-virtlogd + check-augeas-bhyve check-augeas-virtlogd check-augeas-libvirtd =20 AUG_GENTEST =3D $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST +=3D $(top_srcdir)/build-aux/augeas-gentest.pl @@ -2258,6 +2268,18 @@ check-augeas-virtlogd: test_virtlogd.aug '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \ fi =20 +if WITH_LIBVIRTD +test_libvirtd.aug: remote/test_libvirtd.aug.in \ + remote/libvirtd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< $@ + +check-augeas-libvirtd: test_libvirtd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \ + fi +else ! WITH_LIBVIRTD +check-augeas-libvirtd: +endif ! WITH_LIBVIRTD # # Build our version script. This is composed of three parts: # diff --git a/daemon/libvirtd.aug b/src/remote/libvirtd.aug similarity index 100% rename from daemon/libvirtd.aug rename to src/remote/libvirtd.aug diff --git a/daemon/libvirtd.conf b/src/remote/libvirtd.conf similarity index 100% rename from daemon/libvirtd.conf rename to src/remote/libvirtd.conf diff --git a/daemon/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug.in similarity index 100% rename from daemon/test_libvirtd.aug.in rename to src/remote/test_libvirtd.aug.in --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list