From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25C87138335 for ; Sun, 17 Mar 2019 07:28:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDAA6E09B8; Sun, 17 Mar 2019 07:27:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE7C7E09B7 for ; Sun, 17 Mar 2019 07:27:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6F13335C9F for ; Sun, 17 Mar 2019 07:27:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48CC7569 for ; Sun, 17 Mar 2019 07:27:56 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1552805582.b0c50b9cb54e16e7f2fae10c7a81ba19fc6cf0e2.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ app-emulation/libvirt/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: b0c50b9cb54e16e7f2fae10c7a81ba19fc6cf0e2 X-VCS-Branch: master Date: Sun, 17 Mar 2019 07:27:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6872fcf3-2b20-4817-aba4-0d5e615c1e15 X-Archives-Hash: 79a0d045a86798be775e9e1d375aabaa commit: b0c50b9cb54e16e7f2fae10c7a81ba19fc6cf0e2 Author: Michal Privoznik redhat com> AuthorDate: Sun Mar 17 05:50:05 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Sun Mar 17 06:53:02 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c50b9c app-emulation/libvirt-9999: Rebase libvirt-5.1.0-do-not-use-sysconf.patch In the upstream, the Makefile.am file that the patch is fixing was changed leaving the patch failing to apply. Signed-off-by: Michal Privoznik redhat.com> Signed-off-by: Matthias Maier gentoo.org> ...atch => libvirt-5.2.0-do-not-use-sysconf.patch} | 80 +++++----------------- app-emulation/libvirt/libvirt-9999.ebuild | 2 +- 2 files changed, 18 insertions(+), 64 deletions(-) diff --git a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch similarity index 69% rename from app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch rename to app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch index 3c32ab81f1d..292af16b491 100644 --- a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch +++ b/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch @@ -1,25 +1,25 @@ -From cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27 Mon Sep 17 00:00:00 2001 -Message-Id: +From 525d89d39f78a4099508f47a58c4ab65d1e59c0a Mon Sep 17 00:00:00 2001 +Message-Id: <525d89d39f78a4099508f47a58c4ab65d1e59c0a.1552736006.git.mprivozn@redhat.com> From: Michal Privoznik -Date: Tue, 26 Jun 2018 06:51:06 +0200 +Date: Sat, 16 Mar 2019 12:33:00 +0100 Subject: [PATCH] gentoo: do not use sysconf Signed-off-by: Michal Privoznik --- - src/Makefile.am | 29 ++++++----------------------- + src/Makefile.am | 21 ++------------------- src/locking/virtlockd.service.in | 3 +-- src/logging/virtlogd.service.in | 3 +-- src/remote/libvirtd.service.in | 3 +-- - tools/Makefile.am | 17 ++++------------- + tools/Makefile.am | 13 ++----------- tools/libvirt-guests.service.in | 2 +- tools/libvirt-guests.sysconf | 7 +++++++ - 7 files changed, 21 insertions(+), 43 deletions(-) + 7 files changed, 15 insertions(+), 37 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 8c8dfe3dcf..25ced3abf3 100644 +index a73f43c483..47dd55c112 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT +@@ -747,23 +747,6 @@ endif WITH_SETUID_RPC_CLIENT EXTRA_DIST += $(SYSCONF_FILES) @@ -40,27 +40,10 @@ index 8c8dfe3dcf..25ced3abf3 100644 - done - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : - - SYSVINIT_FILES_IN += \ - locking/virtlockd.init.in \ - $(NULL) -@@ -816,14 +799,14 @@ if WITH_LIBVIRTD - if LIBVIRT_INIT_SCRIPT_RED_HAT - initdir = $(sysconfdir)/rc.d/init.d + LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) --install-init: $(SYSVINIT_FILES) install-sysconfig -+install-init: $(SYSVINIT_FILES) - $(MKDIR_P) $(DESTDIR)$(initdir) - for f in $(SYSVINIT_FILES:%.init=%) ; \ - do \ - $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \ - done - --uninstall-init: uninstall-sysconfig -+uninstall-init: - rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%) - rmdir $(DESTDIR)$(initdir) || : - -@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) + EXTRA_DIST += $(LOGROTATE_FILES_IN) +@@ -822,14 +805,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) @@ -77,24 +60,6 @@ index 8c8dfe3dcf..25ced3abf3 100644 rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES) - if WITH_LIBVIRTD - if LIBVIRT_INIT_SCRIPT_UPSTART - --install-upstart: install-sysconfig -+install-upstart: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d - for f in $(UPSTART_FILES:%.upstart=%); \ - do \ -@@ -893,7 +876,7 @@ install-upstart: install-sysconfig - $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ - done - --uninstall-upstart: uninstall-sysconfig -+uninstall-upstart: - for f in $(UPSTART_FILES:%.upstart=%); \ - do \ - tgt=`basename $$f` ; \ diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index 3c9d587032..2449b201d9 100644 --- a/src/locking/virtlockd.service.in @@ -138,11 +103,11 @@ index 7f689e08a8..239beeced9 100644 KillMode=process Restart=on-failure diff --git a/tools/Makefile.am b/tools/Makefile.am -index 613c9a77f0..224b511074 100644 +index c6064dee08..40f41ddb38 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am -@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \ - uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ +@@ -333,15 +333,6 @@ install-data-local: install-systemd install-nss \ + uninstall-local: uninstall-systemd uninstall-nss \ uninstall-bash-completion -install-sysconfig: @@ -154,21 +119,10 @@ index 613c9a77f0..224b511074 100644 - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests - rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: - - EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in - - install-initscript: libvirt-guests.init -@@ -362,8 +353,8 @@ uninstall-initscript: + EXTRA_DIST += libvirt-guests.sh.in - if LIBVIRT_INIT_SCRIPT_RED_HAT - BUILT_SOURCES += libvirt-guests.init --install-init: install-sysconfig install-initscript --uninstall-init: uninstall-sysconfig uninstall-initscript -+install-init: install-initscript -+uninstall-init: uninstall-initscript - else ! LIBVIRT_INIT_SCRIPT_RED_HAT - install-init: - uninstall-init: -@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in + libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status +@@ -361,12 +352,12 @@ EXTRA_DIST += libvirt-guests.service.in SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 18c56b58956..ad8ef5b0f12 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -125,7 +125,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-5.1.0-do-not-use-sysconf.patch + "${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch )