diff options
| author |   Michal Privoznik <mprivozn@redhat.com> | 2020-01-31 11:21:41 +0100 |
|---|---|---|
| committer |   Matthias Maier <tamiko@gentoo.org> | 2020-02-06 09:45:54 -0600 |
| commit | 6a7d4b390c8354a1e5956186e1b9c8c3e1070245 (patch) | |
| tree | ab1a349a852844c8a15f8cf0c0264f078bcc11ce /app-emulation/libvirt | |
| parent | app-emulation/libvirt-9999: Apply rebased do-not-use-sysconf.patch (diff) | |
| download | gentoo-6a7d4b390c8354a1e5956186e1b9c8c3e1070245.tar.gz gentoo-6a7d4b390c8354a1e5956186e1b9c8c3e1070245.tar.bz2 gentoo-6a7d4b390c8354a1e5956186e1b9c8c3e1070245.zip | |
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 <mprivozn@redhat.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/libvirt')
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch | 35 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 2 |
2 files changed, 36 insertions, 1 deletions
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 000000000000..bf7a328f7759 --- /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: <e97700d867ffa949c97f8a635a76b9ce510e806f.1580460243.git.mprivozn@redhat.com> +In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> +References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> +From: Michal Privoznik <mprivozn@redhat.com> +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 <mprivozn@redhat.com> +--- + 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 2d7662034fdc..f26794bd40bb 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() { |