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 6609C138350 for ; Thu, 6 Feb 2020 15:52:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 174D4E08AD; Thu, 6 Feb 2020 15:52:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DCB42E08AD for ; Thu, 6 Feb 2020 15:52:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7CADF34E834 for ; Thu, 6 Feb 2020 15:52:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31C8612A for ; Thu, 6 Feb 2020 15:52:25 +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: <1581003954.6a7d4b390c8354a1e5956186e1b9c8c3e1070245.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-6.0.0-fix_paths_in_libvirt-guests_sh.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: 6a7d4b390c8354a1e5956186e1b9c8c3e1070245 X-VCS-Branch: master Date: Thu, 6 Feb 2020 15:52:25 +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: 7d92e3a2-e289-4160-9f76-bbc9c3bf446c X-Archives-Hash: c07a56595fbce583bec8fa2647e8dff5 commit: 6a7d4b390c8354a1e5956186e1b9c8c3e1070245 Author: Michal Privoznik redhat com> AuthorDate: Fri Jan 31 10:21:41 2020 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Feb 6 15:45:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7d4b39 app-emulation/libvirt: Rebase fix_paths_in_libvirt-guests_sh.patch Strictly speaking, this is not needed. But the upstream version of the libvirt-guests.sh file has changed a bit so patch needs to do some offsetting when applying the patch. Avoid that by rebasing the patch onto current upstream. Signed-off-by: Michal Privoznik redhat.com> Signed-off-by: Matthias Maier gentoo.org> ...virt-6.0.0-fix_paths_in_libvirt-guests_sh.patch | 35 ++++++++++++++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch new file mode 100644 index 00000000000..bf7a328f775 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch @@ -0,0 +1,35 @@ +From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> +References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> +From: Michal Privoznik +Date: Fri, 31 Jan 2020 09:42:14 +0100 +Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in + +Signed-off-by: Michal Privoznik +--- + tools/libvirt-guests.sh.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in +index a881f6266e..79d38b3e9a 100644 +--- a/tools/libvirt-guests.sh.in ++++ b/tools/libvirt-guests.sh.in +@@ -39,11 +39,11 @@ START_DELAY=0 + BYPASS_CACHE=0 + SYNC_TIME=0 + +-test -f "$sysconfdir"/sysconfig/libvirt-guests && +- . "$sysconfdir"/sysconfig/libvirt-guests ++test -f "$sysconfdir"/libvirt/libvirt-guests.conf && ++ . "$sysconfdir"/libvirt/libvirt-guests.conf + + LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests +-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests ++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests + + RETVAL=0 + +-- +2.24.1 + diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 2d7662034fd..f26794bd40b 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -124,8 +124,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch + "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch ) pkg_setup() {