From nobody Fri Apr 19 10:32:39 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 15471295214841016.5225693613847; Thu, 10 Jan 2019 06:12:01 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45DEF7AE8B; Thu, 10 Jan 2019 14:11:59 +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 E78537E497; Thu, 10 Jan 2019 14:11:58 +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 9CF863F607; Thu, 10 Jan 2019 14:11:58 +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 x0AEBqNK006245 for ; Thu, 10 Jan 2019 09:11:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7A67826579; Thu, 10 Jan 2019 14:11:52 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0179E27C4D for ; Thu, 10 Jan 2019 14:11:51 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 10 Jan 2019 15:11:44 +0100 Message-Id: <20190110141146.3102-2-abologna@redhat.com> In-Reply-To: <20190110141146.3102-1-abologna@redhat.com> References: <20190110141146.3102-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/3] src: Define initdir 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 10 Jan 2019 14:11:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Avoid building the same path several times. Signed-off-by: Andrea Bolognani --- src/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d3e8a1b572..0a8f54120d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -811,16 +811,18 @@ uninstall-logrotate: endif ! WITH_LIBVIRTD =20 if LIBVIRT_INIT_SCRIPT_RED_HAT +initdir =3D $(sysconfdir)/rc.d/init.d + install-init:: $(SYSVINIT_FILES) install-sysconfig - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d + $(MKDIR_P) $(DESTDIR)$(initdir) for f in $(SYSVINIT_FILES:%.init=3D%) ; \ do \ - $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/$$f; \ + $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \ done =20 uninstall-init:: uninstall-sysconfig - rm -f $(SYSVINIT_FILES:%.init=3D$(DESTDIR)$(sysconfdir)/rc.d/init.d/%) - rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : + rm -f $(SYSVINIT_FILES:%.init=3D$(DESTDIR)$(initdir)/%) + rmdir $(DESTDIR)$(initdir) || : =20 BUILT_SOURCES +=3D $(SYSVINIT_FILES) DISTCLEANFILES +=3D $(SYSVINIT_FILES) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 10:32:39 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 1547129518824159.63013165499865; Thu, 10 Jan 2019 06:11:58 -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 DAEA5A1F64; Thu, 10 Jan 2019 14:11:56 +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 A237C672E5; Thu, 10 Jan 2019 14:11:56 +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 5FEF93F605; Thu, 10 Jan 2019 14:11:56 +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 x0AEBrDq006255 for ; Thu, 10 Jan 2019 09:11:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4E94E27C4B; Thu, 10 Jan 2019 14:11:53 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C8C7126579 for ; Thu, 10 Jan 2019 14:11:52 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 10 Jan 2019 15:11:45 +0100 Message-Id: <20190110141146.3102-3-abologna@redhat.com> In-Reply-To: <20190110141146.3102-1-abologna@redhat.com> References: <20190110141146.3102-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/3] src: Only install SysV init scripts when libvirtd 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-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.39]); Thu, 10 Jan 2019 14:11:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This is consistent with the way we already handle configuration for other init systems such as upstart and systemd. Signed-off-by: Andrea Bolognani --- src/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 0a8f54120d..82a96adb99 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -810,6 +810,7 @@ install-logrotate: uninstall-logrotate: endif ! WITH_LIBVIRTD =20 +if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_RED_HAT initdir =3D $(sysconfdir)/rc.d/init.d =20 @@ -830,6 +831,10 @@ else ! LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: uninstall-init:: endif ! LIBVIRT_INIT_SCRIPT_RED_HAT +else ! WITH_LIBVIRTD +install-init:: +uninstall-init:: +endif ! WITH_LIBVIRTD =20 =20 %.8: %.8.in $(top_srcdir)/configure.ac --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 10:32:39 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 15471295232270.07295852174786432; Thu, 10 Jan 2019 06:12:03 -0800 (PST) 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 0B5EF76549; Thu, 10 Jan 2019 14:12:01 +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 CC5931019626; Thu, 10 Jan 2019 14:12: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 874161832E8F; Thu, 10 Jan 2019 14:12: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 x0AEBsv7006262 for ; Thu, 10 Jan 2019 09:11:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 243A326579; Thu, 10 Jan 2019 14:11:54 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DD3D27C51 for ; Thu, 10 Jan 2019 14:11:53 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 10 Jan 2019 15:11:46 +0100 Message-Id: <20190110141146.3102-4-abologna@redhat.com> In-Reply-To: <20190110141146.3102-1-abologna@redhat.com> References: <20190110141146.3102-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 3/3] 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.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.26]); Thu, 10 Jan 2019 14:12:01 +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 | 59 ++++++++++++++++---------------------- src/remote/Makefile.inc.am | 30 ++++++++----------- 2 files changed, 37 insertions(+), 52 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 82a96adb99..cd386297ed 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 WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_RED_HAT @@ -827,14 +829,11 @@ 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 -else ! WITH_LIBVIRTD -install-init:: -uninstall-init:: -endif ! WITH_LIBVIRTD + +INSTALL_DATA_LOCAL +=3D install-init +UNINSTALL_LOCAL +=3D uninstall-init +endif LIBVIRT_INIT_SCRIPT_RED_HAT +endif WITH_LIBVIRTD =20 =20 %.8: %.8.in $(top_srcdir)/configure.ac @@ -873,14 +872,11 @@ 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 +endif WITH_LIBVIRTD =20 =20 EXTRA_DIST +=3D $(UPSTART_FILES) @@ -904,14 +900,11 @@ 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 +endif WITH_LIBVIRTD =20 =20 EXTRA_DIST +=3D dtrace2systemtap.pl @@ -1010,17 +1003,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 3355dc68e5..0988435eed 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 polkitdir =3D $(datadir)/polkit-1 @@ -227,17 +227,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 \ @@ -258,10 +252,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