From nobody Thu Apr 25 00:14:52 2024 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 1547058963309524.3488067679036; Wed, 9 Jan 2019 10:36:03 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0629AC0C2344; Wed, 9 Jan 2019 18:36:00 +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 BDE2817D4F; Wed, 9 Jan 2019 18:35:59 +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 DE6763F7CB; Wed, 9 Jan 2019 18:35:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09IZvxR026076 for ; Wed, 9 Jan 2019 13:35:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3EBB817D4F; Wed, 9 Jan 2019 18:35:57 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA00717C1A for ; Wed, 9 Jan 2019 18:35:56 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:48 +0100 Message-Id: <20190109183554.12296-2-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/7] remote: Move polkitdir definition 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-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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 09 Jan 2019 18:36:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" No need to have two conditional blocks. Signed-off-by: Andrea Bolognani --- src/remote/Makefile.inc.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index d188c4e348..04a2ec8cc0 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -123,10 +123,6 @@ conf_DATA +=3D remote/libvirtd.conf =20 CLEANFILES +=3D test_libvirtd.aug =20 -if WITH_POLKIT -policydir =3D $(datadir)/polkit-1/actions -endif WITH_POLKIT - man8_MANS +=3D libvirtd.8 =20 libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES) @@ -211,6 +207,8 @@ uninstall-sysctl: endif ! WITH_SYSCTL =20 if WITH_POLKIT +policydir =3D $(datadir)/polkit-1/actions + install-polkit:: $(MKDIR_P) $(DESTDIR)$(policydir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 00:14:52 2024 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 1547058963009457.4552159292342; Wed, 9 Jan 2019 10:36:03 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 937608050D; Wed, 9 Jan 2019 18:36:00 +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 6055317F7B; Wed, 9 Jan 2019 18:36: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 1B0483F7D5; Wed, 9 Jan 2019 18:36:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09IZwrQ026089 for ; Wed, 9 Jan 2019 13:35:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1157517C1A; Wed, 9 Jan 2019 18:35:58 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D00217D4F for ; Wed, 9 Jan 2019 18:35:57 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:49 +0100 Message-Id: <20190109183554.12296-3-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/7] remote: Define polkit{actions,rules}dir 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-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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 09 Jan 2019 18:36:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Avoid building the same path several times. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- src/remote/Makefile.inc.am | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 04a2ec8cc0..d9f559dce5 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -207,21 +207,22 @@ uninstall-sysctl: endif ! WITH_SYSCTL =20 if WITH_POLKIT -policydir =3D $(datadir)/polkit-1/actions +polkitactionsdir =3D $(datadir)/polkit-1/actions +polkitrulesdir =3D $(datadir)/polkit-1/rules.d =20 install-polkit:: - $(MKDIR_P) $(DESTDIR)$(policydir) + $(MKDIR_P) $(DESTDIR)$(polkitactionsdir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \ - $(DESTDIR)$(policydir)/org.libvirt.unix.policy - $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d + $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy + $(MKDIR_P) $(DESTDIR)$(polkitrulesdir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ - $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules + $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules =20 uninstall-polkit:: - rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy - rmdir $(DESTDIR)$(policydir) || : - rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules - rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d || : + rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy + rmdir $(DESTDIR)$(polkitactionsdir) || : + rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules + rmdir $(DESTDIR)$(polkitrulesdir) || : =20 else ! WITH_POLKIT install-polkit:: --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 00:14:52 2024 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 1547058969724662.2581561775262; Wed, 9 Jan 2019 10:36:09 -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 BEBF17E9CF; Wed, 9 Jan 2019 18:36:06 +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 87D6E5D76D; Wed, 9 Jan 2019 18:36:06 +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 3577A18433EE; Wed, 9 Jan 2019 18:36:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09IZwpU026099 for ; Wed, 9 Jan 2019 13:35:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id D82BA17C1A; Wed, 9 Jan 2019 18:35:58 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DF27299C2 for ; Wed, 9 Jan 2019 18:35:58 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:50 +0100 Message-Id: <20190109183554.12296-4-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/7] remote: Define sysctldir 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-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.26]); Wed, 09 Jan 2019 18:36:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Avoid building the same path several times. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- src/remote/Makefile.inc.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index d9f559dce5..0633b05768 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -193,14 +193,16 @@ check-augeas-remote: test_libvirtd.aug if WITH_SYSCTL # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on # /usr/lib/sysctl.d/ even when libdir is /usr/lib64 +sysctldir =3D $(prefix)/lib/sysctl.d + install-sysctl: - $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d + $(MKDIR_P) $(DESTDIR)$(sysctldir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \ - $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf + $(DESTDIR)$(sysctldir)/60-libvirtd.conf =20 uninstall-sysctl: - rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf - rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || : + rm -f $(DESTDIR)$(sysctldir)/60-libvirtd.conf + rmdir $(DESTDIR)$(sysctldir) || : else ! WITH_SYSCTL install-sysctl: uninstall-sysctl: --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 00:14:52 2024 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 1547058969136709.1665979296631; Wed, 9 Jan 2019 10:36:09 -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 B33DD7E9C7; Wed, 9 Jan 2019 18:36:06 +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 793A05D76A; Wed, 9 Jan 2019 18:36:06 +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 2F51418433AF; Wed, 9 Jan 2019 18:36:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09IZx0o026111 for ; Wed, 9 Jan 2019 13:35:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id AA8D517C1A; Wed, 9 Jan 2019 18:35:59 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 316721852D for ; Wed, 9 Jan 2019 18:35:59 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:51 +0100 Message-Id: <20190109183554.12296-5-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/7] remote: Define sasldir 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-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.26]); Wed, 09 Jan 2019 18:36:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Avoid building the same path several times. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- src/remote/Makefile.inc.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 0633b05768..5ef082c595 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -247,14 +247,16 @@ endif ! WITH_LIBVIRTD # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional if WITH_SASL +sasldir =3D $(sysconfdir)/sasl2 + install-sasl: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ + $(MKDIR_P) $(DESTDIR)$(sasldir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \ - $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf + $(DESTDIR)$(sasldir)/libvirt.conf =20 uninstall-sasl: - rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf - rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : + rm -f $(DESTDIR)$(sasldir)/libvirt.conf + rmdir $(DESTDIR)$(sasldir) || : else ! WITH_SASL install-sasl: uninstall-sasl: --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 00:14:52 2024 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 1547058974747601.4352032699912; Wed, 9 Jan 2019 10:36:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E97D9C7A2D; Wed, 9 Jan 2019 18:36:10 +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 A25129CC7; Wed, 9 Jan 2019 18:36:10 +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 599A63F602; Wed, 9 Jan 2019 18:36:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09Ia9OO026133 for ; Wed, 9 Jan 2019 13:36:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 879A517C1A; Wed, 9 Jan 2019 18:36:09 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E4ED299C4 for ; Wed, 9 Jan 2019 18:35:59 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:52 +0100 Message-Id: <20190109183554.12296-6-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/7] src: Simplify installing/uninstalling data 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-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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 09 Jan 2019 18:36:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Instead of defining targets conditionally and depending on them unconditionally, define a couple of variables and conditionally add targets to them. In addition to removing a bunch of useless code, this has the nice effect of no longer requiring the main Makefile.am to have any knowledge about the contents of the various snippets it includes. Signed-off-by: Andrea Bolognani --- src/Makefile.am | 54 ++++++++++++++++---------------------- src/remote/Makefile.inc.am | 30 +++++++++------------ 2 files changed, 34 insertions(+), 50 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d3e8a1b572..ce1a810a0f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,6 +72,8 @@ STATEFUL_DRIVER_SOURCE_FILES =3D noinst_LTLIBRARIES =3D mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D +INSTALL_DATA_LOCAL =3D +UNINSTALL_LOCAL =3D libvirt_la_BUILT_LIBADD =3D SYM_FILES =3D USED_SYM_FILES =3D @@ -805,10 +807,10 @@ install-logrotate: $(LOGROTATE_FILES) uninstall-logrotate: rm -f $(LOGROTATE_FILES:%.logrotate=3D$(DESTDIR)$(sysconfdir)/logrotate.d= /%) rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : -else ! WITH_LIBVIRTD -install-logrotate: -uninstall-logrotate: -endif ! WITH_LIBVIRTD + +INSTALL_DATA_LOCAL +=3D install-logrotate +UNINSTALL_LOCAL +=3D uninstall-logrotate +endif WITH_LIBVIRTD =20 if LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: $(SYSVINIT_FILES) install-sysconfig @@ -824,10 +826,10 @@ uninstall-init:: uninstall-sysconfig =20 BUILT_SOURCES +=3D $(SYSVINIT_FILES) DISTCLEANFILES +=3D $(SYSVINIT_FILES) -else ! LIBVIRT_INIT_SCRIPT_RED_HAT -install-init:: -uninstall-init:: -endif ! LIBVIRT_INIT_SCRIPT_RED_HAT + +INSTALL_DATA_LOCAL +=3D install-init +UNINSTALL_LOCAL +=3D uninstall-init +endif LIBVIRT_INIT_SCRIPT_RED_HAT =20 =20 %.8: %.8.in $(top_srcdir)/configure.ac @@ -847,7 +849,6 @@ EXTRA_DIST +=3D \ $(NULL) =20 =20 -if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD =20 SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system @@ -866,19 +867,14 @@ install-systemd: $(SYSTEMD_UNIT_FILES) install-syscon= fig uninstall-systemd: uninstall-sysconfig rm -f $(SYSTEMD_UNIT_FILES:%=3D$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -else ! LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: -uninstall-systemd: -endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD -else ! WITH_LIBVIRTD -install-systemd: -uninstall-systemd: -endif ! WITH_LIBVIRTD + +INSTALL_DATA_LOCAL +=3D install-systemd +UNINSTALL_LOCAL +=3D uninstall-systemd +endif LIBVIRT_INIT_SCRIPT_SYSTEMD =20 =20 EXTRA_DIST +=3D $(UPSTART_FILES) =20 -if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_UPSTART =20 install-upstart: install-sysconfig @@ -897,14 +893,10 @@ uninstall-upstart: uninstall-sysconfig rm -f $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ done rmdir $(DESTDIR)$(sysconfdir)/event.d || : -else ! LIBVIRT_INIT_SCRIPT_UPSTART -install-upstart: -uninstall-upstart: -endif ! LIBVIRT_INIT_SCRIPT_UPSTART -else ! WITH_LIBVIRTD -install-upstart: -uninstall-upstart: -endif ! WITH_LIBVIRTD + +INSTALL_DATA_LOCAL +=3D install-upstart +UNINSTALL_LOCAL +=3D uninstall-upstart +endif LIBVIRT_INIT_SCRIPT_UPSTART =20 =20 EXTRA_DIST +=3D dtrace2systemtap.pl @@ -1003,17 +995,15 @@ libvirt_nss_la_LIBADD =3D \ endif WITH_NSS =20 =20 -install-data-local: install-init install-systemd install-upstart \ - install-sysctl install-polkit install-sasl \ - install-logrotate $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) +install-data-local: $(INSTALL_DATA_LOCAL) \ + $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" =20 -uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ - uninstall-sysctl uninstall-polkit uninstall-sasl \ - uninstall-logrotate $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) +uninstall-local:: $(UNINSTALL_LOCAL) \ + $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 5ef082c595..4a415d4482 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -203,10 +203,10 @@ install-sysctl: uninstall-sysctl: rm -f $(DESTDIR)$(sysctldir)/60-libvirtd.conf rmdir $(DESTDIR)$(sysctldir) || : -else ! WITH_SYSCTL -install-sysctl: -uninstall-sysctl: -endif ! WITH_SYSCTL + +INSTALL_DATA_LOCAL +=3D install-sysctl +UNINSTALL_LOCAL +=3D uninstall-sysctl +endif WITH_SYSCTL =20 if WITH_POLKIT polkitactionsdir =3D $(datadir)/polkit-1/actions @@ -226,17 +226,11 @@ uninstall-polkit:: rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules rmdir $(DESTDIR)$(polkitrulesdir) || : =20 -else ! WITH_POLKIT -install-polkit:: -uninstall-polkit:: -endif ! WITH_POLKIT +INSTALL_DATA_LOCAL +=3D install-polkit +UNINSTALL_LOCAL +=3D uninstall-polkit +endif WITH_POLKIT =20 -else ! WITH_LIBVIRTD -install-polkit:: -uninstall-polkit:: -install-sysctl:: -uninstall-sysctl:: -endif ! WITH_LIBVIRTD +endif WITH_LIBVIRTD =20 .PHONY: \ install-data-remote \ @@ -257,10 +251,10 @@ install-sasl: uninstall-sasl: rm -f $(DESTDIR)$(sasldir)/libvirt.conf rmdir $(DESTDIR)$(sasldir) || : -else ! WITH_SASL -install-sasl: -uninstall-sasl: -endif ! WITH_SASL + +INSTALL_DATA_LOCAL +=3D install-sasl +UNINSTALL_LOCAL +=3D uninstall-sasl +endif WITH_SASL =20 libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 00:14:52 2024 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 1547058977470966.9684117842486; Wed, 9 Jan 2019 10:36:17 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 069E62CD7EB; Wed, 9 Jan 2019 18:36:15 +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 B5B4C8517; Wed, 9 Jan 2019 18:36:14 +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 61973184B54A; Wed, 9 Jan 2019 18:36:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09IaAFg026142 for ; Wed, 9 Jan 2019 13:36:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5A95E299C2; Wed, 9 Jan 2019 18:36:10 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D529517C1A for ; Wed, 9 Jan 2019 18:36:09 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:53 +0100 Message-Id: <20190109183554.12296-7-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/7] apparmor: Move static data out of examples/ 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-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 09 Jan 2019 18:36:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" These files need to be installed on the system for apparmor support to work, so they don't belong with examples. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- examples/Makefile.am | 40 ------------------- src/security/Makefile.inc.am | 40 +++++++++++++++++++ .../security}/apparmor/TEMPLATE.lxc | 0 .../security}/apparmor/TEMPLATE.qemu | 0 .../security}/apparmor/libvirt-lxc | 0 .../security}/apparmor/libvirt-qemu | 0 .../apparmor/usr.lib.libvirt.virt-aa-helper | 0 .../security}/apparmor/usr.sbin.libvirtd | 0 8 files changed, 40 insertions(+), 40 deletions(-) rename {examples =3D> src/security}/apparmor/TEMPLATE.lxc (100%) rename {examples =3D> src/security}/apparmor/TEMPLATE.qemu (100%) rename {examples =3D> src/security}/apparmor/libvirt-lxc (100%) rename {examples =3D> src/security}/apparmor/libvirt-qemu (100%) rename {examples =3D> src/security}/apparmor/usr.lib.libvirt.virt-aa-helpe= r (100%) rename {examples =3D> src/security}/apparmor/usr.sbin.libvirtd (100%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 76907a1c8f..e2ec6e7fba 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -19,12 +19,6 @@ FILTERS =3D $(wildcard $(srcdir)/xml/nwfilter/*.xml) =20 EXTRA_DIST =3D \ - apparmor/TEMPLATE.qemu \ - apparmor/TEMPLATE.lxc \ - apparmor/libvirt-qemu \ - apparmor/libvirt-lxc \ - apparmor/usr.lib.libvirt.virt-aa-helper \ - apparmor/usr.sbin.libvirtd \ lxcconvert/virt-lxc-convert \ polkit/libvirt-acl.rules \ $(wildcard $(srcdir)/systemtap/*.stp) \ @@ -70,40 +64,6 @@ admin_logging_SOURCES =3D admin/logging.c INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D =20 -if WITH_APPARMOR_PROFILES -apparmordir =3D $(sysconfdir)/apparmor.d/ -apparmor_DATA =3D \ - apparmor/usr.lib.libvirt.virt-aa-helper \ - apparmor/usr.sbin.libvirtd \ - $(NULL) - -abstractionsdir =3D $(apparmordir)/abstractions -abstractions_DATA =3D \ - apparmor/libvirt-qemu \ - apparmor/libvirt-lxc \ - $(NULL) - -templatesdir =3D $(apparmordir)/libvirt -templates_DATA =3D \ - apparmor/TEMPLATE.qemu \ - apparmor/TEMPLATE.lxc \ - $(NULL) - -APPARMOR_LOCAL_DIR =3D "$(DESTDIR)$(apparmordir)/local" -install-apparmor-local: - $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - echo "# Site-specific additions and overrides for \ - 'usr.lib.libvirt.virt-aa-helper'" \ - >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" - -uninstall-apparmor-local: - rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" - rmdir "$(APPARMOR_LOCAL_DIR)" || : - -INSTALL_DATA_LOCAL +=3D install-apparmor-local -UNINSTALL_LOCAL +=3D uninstall-apparmor-local -endif WITH_APPARMOR_PROFILES - if WITH_NWFILTER NWFILTER_DIR =3D "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" =20 diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 0ade97d355..b24cdfd083 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -32,6 +32,12 @@ EXTRA_DIST +=3D \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) \ + security/apparmor/TEMPLATE.qemu \ + security/apparmor/TEMPLATE.lxc \ + security/apparmor/libvirt-qemu \ + security/apparmor/libvirt-lxc \ + security/apparmor/usr.lib.libvirt.virt-aa-helper \ + security/apparmor/usr.sbin.libvirtd \ $(NULL) =20 libvirt_security_manager_la_SOURCES =3D $(SECURITY_DRIVER_SOURCES) @@ -80,3 +86,37 @@ virt_aa_helper_CFLAGS =3D \ $(NULL) endif WITH_LIBVIRTD endif WITH_SECDRIVER_APPARMOR + +if WITH_APPARMOR_PROFILES +apparmordir =3D $(sysconfdir)/apparmor.d/ +apparmor_DATA =3D \ + security/apparmor/usr.lib.libvirt.virt-aa-helper \ + security/apparmor/usr.sbin.libvirtd \ + $(NULL) + +abstractionsdir =3D $(apparmordir)/abstractions +abstractions_DATA =3D \ + security/apparmor/libvirt-qemu \ + security/apparmor/libvirt-lxc \ + $(NULL) + +templatesdir =3D $(apparmordir)/libvirt +templates_DATA =3D \ + security/apparmor/TEMPLATE.qemu \ + security/apparmor/TEMPLATE.lxc \ + $(NULL) + +APPARMOR_LOCAL_DIR =3D "$(DESTDIR)$(apparmordir)/local" +install-apparmor-local: + $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" + echo "# Site-specific additions and overrides for \ + 'usr.lib.libvirt.virt-aa-helper'" \ + >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" + +uninstall-apparmor-local: + rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" + rmdir "$(APPARMOR_LOCAL_DIR)" || : + +INSTALL_DATA_LOCAL +=3D install-apparmor-local +UNINSTALL_LOCAL +=3D uninstall-apparmor-local +endif WITH_APPARMOR_PROFILES diff --git a/examples/apparmor/TEMPLATE.lxc b/src/security/apparmor/TEMPLAT= E.lxc similarity index 100% rename from examples/apparmor/TEMPLATE.lxc rename to src/security/apparmor/TEMPLATE.lxc diff --git a/examples/apparmor/TEMPLATE.qemu b/src/security/apparmor/TEMPLA= TE.qemu similarity index 100% rename from examples/apparmor/TEMPLATE.qemu rename to src/security/apparmor/TEMPLATE.qemu diff --git a/examples/apparmor/libvirt-lxc b/src/security/apparmor/libvirt-= lxc similarity index 100% rename from examples/apparmor/libvirt-lxc rename to src/security/apparmor/libvirt-lxc diff --git a/examples/apparmor/libvirt-qemu b/src/security/apparmor/libvirt= -qemu similarity index 100% rename from examples/apparmor/libvirt-qemu rename to src/security/apparmor/libvirt-qemu diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/src/securit= y/apparmor/usr.lib.libvirt.virt-aa-helper similarity index 100% rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper rename to src/security/apparmor/usr.lib.libvirt.virt-aa-helper diff --git a/examples/apparmor/usr.sbin.libvirtd b/src/security/apparmor/us= r.sbin.libvirtd similarity index 100% rename from examples/apparmor/usr.sbin.libvirtd rename to src/security/apparmor/usr.sbin.libvirtd --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 00:14:52 2024 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 1547058976378564.8412953210815; Wed, 9 Jan 2019 10:36:16 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFE5F155AC; Wed, 9 Jan 2019 18:36:13 +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 A93D76013A; Wed, 9 Jan 2019 18:36:13 +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 5BF0618433AF; Wed, 9 Jan 2019 18:36:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09IaBFI026149 for ; Wed, 9 Jan 2019 13:36:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 54050299C4; Wed, 9 Jan 2019 18:36:11 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A90CF17C1A for ; Wed, 9 Jan 2019 18:36:10 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:54 +0100 Message-Id: <20190109183554.12296-8-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/7] src: Add Vim modeline to Makefile.am snippets 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-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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 09 Jan 2019 18:36:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Vim won't recognize them, and thus not enable niceties such as syntax highlighting, otherwise. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- src/access/Makefile.inc.am | 2 ++ src/admin/Makefile.inc.am | 2 ++ src/bhyve/Makefile.inc.am | 2 ++ src/conf/Makefile.inc.am | 2 ++ src/cpu/Makefile.inc.am | 2 ++ src/cpu_map/Makefile.inc.am | 2 ++ src/esx/Makefile.inc.am | 2 ++ src/hyperv/Makefile.inc.am | 2 ++ src/interface/Makefile.inc.am | 2 ++ src/libxl/Makefile.inc.am | 2 ++ src/locking/Makefile.inc.am | 2 ++ src/logging/Makefile.inc.am | 2 ++ src/lxc/Makefile.inc.am | 2 ++ src/network/Makefile.inc.am | 2 ++ src/node_device/Makefile.inc.am | 2 ++ src/nwfilter/Makefile.inc.am | 2 ++ src/openvz/Makefile.inc.am | 2 ++ src/phyp/Makefile.inc.am | 2 ++ src/qemu/Makefile.inc.am | 2 ++ src/remote/Makefile.inc.am | 2 ++ src/rpc/Makefile.inc.am | 2 ++ src/secret/Makefile.inc.am | 2 ++ src/security/Makefile.inc.am | 2 ++ src/storage/Makefile.inc.am | 2 ++ src/test/Makefile.inc.am | 2 ++ src/util/Makefile.inc.am | 2 ++ src/vbox/Makefile.inc.am | 2 ++ src/vmware/Makefile.inc.am | 2 ++ src/vmx/Makefile.inc.am | 2 ++ src/vz/Makefile.inc.am | 2 ++ src/xenapi/Makefile.inc.am | 2 ++ src/xenconfig/Makefile.inc.am | 2 ++ 32 files changed, 64 insertions(+) diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 6d57ca1a1b..ff9e7d445f 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -146,3 +146,5 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatc= h.pl \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ lxc LXC $(LXC_PROTOCOL) access/viraccessapichecklxc.h \ > $(srcdir)/access/viraccessapichecklxc.c + +# vim: filetype=3Dautomake diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 55d721f0bf..ffbfc34200 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -48,3 +48,5 @@ admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendis= patch.pl \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ admin ADMIN $(ADMIN_PROTOCOL) \ > $(srcdir)/admin/admin_server_dispatch_stubs.h + +# vim: filetype=3Dautomake diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index fba1b9ef30..6134f3686c 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -71,3 +71,5 @@ EXTRA_DIST +=3D \ .PHONY: \ check-augeas-bhyve \ $(NULL) + +# vim: filetype=3Dautomake diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am index 219ff350d7..2d22d4614a 100644 --- a/src/conf/Makefile.inc.am +++ b/src/conf/Makefile.inc.am @@ -169,3 +169,5 @@ libvirt_conf_la_CFLAGS =3D \ $(NULL) libvirt_conf_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_conf_la_LIBADD =3D $(LIBXML_LIBS) + +# vim: filetype=3Dautomake diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am index 5020d40583..057e571b83 100644 --- a/src/cpu/Makefile.inc.am +++ b/src/cpu/Makefile.inc.am @@ -22,3 +22,5 @@ libvirt_cpu_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(NULL) libvirt_cpu_la_SOURCES =3D $(CPU_SOURCES) + +# vim: filetype=3Dautomake diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index 9eeb33e4be..8b71552357 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -60,3 +60,5 @@ cpumap_DATA =3D \ $(NULL) =20 EXTRA_DIST +=3D $(cpumap_DATA) + +# vim: filetype=3Dautomake diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 152dd7b979..5ad7f2210c 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -88,3 +88,5 @@ libvirt_driver_esx_la_SOURCES =3D $(ESX_DRIVER_SOURCES) libvirt_driver_esx_la_DEPENDENCIES =3D $(ESX_DRIVER_GENERATED) =20 endif WITH_ESX + +# vim: filetype=3Dautomake diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index a768272b72..2e4263f75d 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -57,3 +57,5 @@ libvirt_driver_hyperv_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_driver_hyperv_la_LIBADD =3D $(OPENWSMAN_LIBS) libvirt_driver_hyperv_la_SOURCES =3D $(HYPERV_DRIVER_SOURCES) endif WITH_HYPERV + +# vim: filetype=3Dautomake diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 08b35d040d..76716fda14 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -40,3 +40,5 @@ libvirt_driver_interface_la_SOURCES +=3D $(INTERFACE_DRIV= ER_UDEV_SOURCES) endif WITH_UDEV libvirt_driver_interface_la_LIBADD +=3D ../gnulib/lib/libgnu.la endif WITH_INTERFACE + +# vim: filetype=3Dautomake diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 59c136bf4e..77f4e0090c 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -102,3 +102,5 @@ EXTRA_DIST +=3D \ libxl/libvirtd_libxl.aug \ libxl/test_libvirtd_libxl.aug.in \ $(NULL) + +# vim: filetype=3Dautomake diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index f2eb2efb7b..42642df731 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -323,3 +323,5 @@ virtlockd.8.in: locking/virtlockd.pod < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ + +# vim: filetype=3Dautomake diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index ae022ade0b..ec2f91b68b 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -153,3 +153,5 @@ virtlogd-admin.socket: logging/virtlogd-admin.socket.in= \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ < $< > $@-t && \ mv $@-t $@ + +# vim: filetype=3Dautomake diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 8dd2e9ea9e..a6cff211f5 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -205,3 +205,5 @@ EXTRA_DIST +=3D \ lxc/libvirtd_lxc.aug \ lxc/test_libvirtd_lxc.aug.in \ $(NULL) + +# vim: filetype=3Dautomake diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 508c8c0422..992fe5b608 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -104,3 +104,5 @@ EXTRA_DIST +=3D network/default.xml install-data-network \ uninstall-data-network \ $(NULL) + +# vim: filetype=3Dautomake diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 0c3ad51273..63579f2778 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -63,3 +63,5 @@ endif WITH_UDEV =20 libvirt_driver_nodedev_la_LIBADD +=3D ../gnulib/lib/libgnu.la endif WITH_NODE_DEVICES + +# vim: filetype=3Dautomake diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 27aa801095..4c0dd9a047 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -40,3 +40,5 @@ libvirt_driver_nwfilter_impl_la_LIBADD =3D \ $(NULL) libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES) endif WITH_NWFILTER + +# vim: filetype=3Dautomake diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am index baad737362..f7adcc4528 100644 --- a/src/openvz/Makefile.inc.am +++ b/src/openvz/Makefile.inc.am @@ -26,3 +26,5 @@ USED_SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms else ! WITH_OPENVZ SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms endif ! WITH_OPENVZ + +# vim: filetype=3Dautomake diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am index 496ff25266..faea97478c 100644 --- a/src/phyp/Makefile.inc.am +++ b/src/phyp/Makefile.inc.am @@ -17,3 +17,5 @@ libvirt_driver_phyp_la_CFLAGS =3D \ $(NULL) libvirt_driver_phyp_la_SOURCES =3D $(PHYP_DRIVER_SOURCES) endif WITH_PHYP + +# vim: filetype=3Dautomake diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 2afa67f195..a9da8b1113 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -162,3 +162,5 @@ EXTRA_DIST +=3D \ qemu/THREADS.txt \ libvirt_qemu_probes.d \ $(NULL) + +# vim: filetype=3Dautomake diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 4a415d4482..8ac2778b6c 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -323,3 +323,5 @@ libvirtd.8.in: remote/libvirtd.pod < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ + +# vim: filetype=3Dautomake diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index b8c80528d2..e12258555e 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -135,3 +135,5 @@ libvirt_net_rpc_client_la_CFLAGS =3D \ $(NULL) libvirt_net_rpc_client_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_net_rpc_client_la_LIBADD =3D $(CYGWIN_EXTRA_LIBADD) + +# vim: filetype=3Dautomake diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 79c2b2d74a..79160437c4 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -36,3 +36,5 @@ libvirt_driver_secret_la_LIBADD =3D \ libvirt_driver_secret_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) libvirt_driver_secret_la_SOURCES =3D $(SECRET_DRIVER_SOURCES) endif WITH_SECRETS + +# vim: filetype=3Dautomake diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index b24cdfd083..3f10e151bd 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -120,3 +120,5 @@ uninstall-apparmor-local: INSTALL_DATA_LOCAL +=3D install-apparmor-local UNINSTALL_LOCAL +=3D uninstall-apparmor-local endif WITH_APPARMOR_PROFILES + +# vim: filetype=3Dautomake diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index b4400b556f..1553bef6ed 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -389,3 +389,5 @@ libvirt_parthelper_CFLAGS =3D \ $(PIE_CFLAGS) \ $(NULL) endif WITH_STORAGE_DISK + +# vim: filetype=3Dautomake diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am index d52c281545..49745192b6 100644 --- a/src/test/Makefile.inc.am +++ b/src/test/Makefile.inc.am @@ -24,3 +24,5 @@ libvirt_driver_test_la_CFLAGS =3D \ $(NULL) libvirt_driver_test_la_SOURCES =3D $(TEST_DRIVER_SOURCES) endif WITH_TEST + +# vim: filetype=3Dautomake diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 4295babac3..58f2bb880d 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -336,3 +336,5 @@ util/virkey%.7: util/virkey%.pod < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ + +# vim: filetype=3Dautomake diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 8c76f84e82..5057ffe92a 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -74,3 +74,5 @@ libvirt_driver_vbox_impl_la_LIBADD =3D \ $(NULL) libvirt_driver_vbox_impl_la_SOURCES =3D $(VBOX_DRIVER_SOURCES) endif WITH_VBOX + +# vim: filetype=3Dautomake diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am index 0fbf866030..1dd202ae3e 100644 --- a/src/vmware/Makefile.inc.am +++ b/src/vmware/Makefile.inc.am @@ -25,3 +25,5 @@ USED_SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms else ! WITH_VMWARE SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms endif ! WITH_VMWARE + +# vim: filetype=3Dautomake diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am index b9bf6ef690..b635484513 100644 --- a/src/vmx/Makefile.inc.am +++ b/src/vmx/Makefile.inc.am @@ -20,3 +20,5 @@ USED_SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms else ! WITH_VMX SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms endif ! WITH_VMX + +# vim: filetype=3Dautomake diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index cacdb38795..b457d2b5c1 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -36,3 +36,5 @@ libvirt_driver_vz_impl_la_LIBADD =3D \ $(LIBNL_LIBS) \ $(NULL) endif WITH_VZ + +# vim: filetype=3Dautomake diff --git a/src/xenapi/Makefile.inc.am b/src/xenapi/Makefile.inc.am index 4640e9943f..9179cf104f 100644 --- a/src/xenapi/Makefile.inc.am +++ b/src/xenapi/Makefile.inc.am @@ -26,3 +26,5 @@ libvirt_driver_xenapi_la_LIBADD =3D \ $(NULL) libvirt_driver_xenapi_la_SOURCES =3D $(XENAPI_DRIVER_SOURCES) endif WITH_XENAPI + +# vim: filetype=3Dautomake diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am index a87d69990f..d7d10f76ed 100644 --- a/src/xenconfig/Makefile.inc.am +++ b/src/xenconfig/Makefile.inc.am @@ -26,3 +26,5 @@ USED_SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms else ! WITH_XENCONFIG SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms endif ! WITH_XENCONFIG + +# vim: filetype=3Dautomake --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list