1 |
commit: 6a7d4b390c8354a1e5956186e1b9c8c3e1070245 |
2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
3 |
AuthorDate: Fri Jan 31 10:21:41 2020 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 6 15:45:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7d4b39 |
7 |
|
8 |
app-emulation/libvirt: Rebase fix_paths_in_libvirt-guests_sh.patch |
9 |
|
10 |
Strictly speaking, this is not needed. But the upstream version |
11 |
of the libvirt-guests.sh file has changed a bit so patch needs to |
12 |
do some offsetting when applying the patch. Avoid that by |
13 |
rebasing the patch onto current upstream. |
14 |
|
15 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
16 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
17 |
|
18 |
...virt-6.0.0-fix_paths_in_libvirt-guests_sh.patch | 35 ++++++++++++++++++++++ |
19 |
app-emulation/libvirt/libvirt-9999.ebuild | 2 +- |
20 |
2 files changed, 36 insertions(+), 1 deletion(-) |
21 |
|
22 |
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 |
23 |
new file mode 100644 |
24 |
index 00000000000..bf7a328f775 |
25 |
--- /dev/null |
26 |
+++ b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch |
27 |
@@ -0,0 +1,35 @@ |
28 |
+From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001 |
29 |
+Message-Id: <e97700d867ffa949c97f8a635a76b9ce510e806f.1580460243.git.mprivozn@××××××.com> |
30 |
+In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@××××××.com> |
31 |
+References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@××××××.com> |
32 |
+From: Michal Privoznik <mprivozn@××××××.com> |
33 |
+Date: Fri, 31 Jan 2020 09:42:14 +0100 |
34 |
+Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in |
35 |
+ |
36 |
+Signed-off-by: Michal Privoznik <mprivozn@××××××.com> |
37 |
+--- |
38 |
+ tools/libvirt-guests.sh.in | 6 +++--- |
39 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
40 |
+ |
41 |
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in |
42 |
+index a881f6266e..79d38b3e9a 100644 |
43 |
+--- a/tools/libvirt-guests.sh.in |
44 |
++++ b/tools/libvirt-guests.sh.in |
45 |
+@@ -39,11 +39,11 @@ START_DELAY=0 |
46 |
+ BYPASS_CACHE=0 |
47 |
+ SYNC_TIME=0 |
48 |
+ |
49 |
+-test -f "$sysconfdir"/sysconfig/libvirt-guests && |
50 |
+- . "$sysconfdir"/sysconfig/libvirt-guests |
51 |
++test -f "$sysconfdir"/libvirt/libvirt-guests.conf && |
52 |
++ . "$sysconfdir"/libvirt/libvirt-guests.conf |
53 |
+ |
54 |
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests |
55 |
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests |
56 |
++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests |
57 |
+ |
58 |
+ RETVAL=0 |
59 |
+ |
60 |
+-- |
61 |
+2.24.1 |
62 |
+ |
63 |
|
64 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
65 |
index 2d7662034fd..f26794bd40b 100644 |
66 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
67 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
68 |
@@ -124,8 +124,8 @@ DEPEND="${RDEPEND} |
69 |
virtual/pkgconfig" |
70 |
|
71 |
PATCHES=( |
72 |
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
73 |
"${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch |
74 |
+ "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch |
75 |
) |
76 |
|
77 |
pkg_setup() { |