1 |
commit: d99c871d82ddda973093333f5dcadc6d3dd19d48 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 4 06:15:47 2015 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 4 06:17:08 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99c871d |
7 |
|
8 |
app-emulation/libvirt: update live build to latest changes (bug #567152) |
9 |
|
10 |
- Due to the introduction of virtlogd one of Gentoo's downstream patches |
11 |
did not apply any more. |
12 |
|
13 |
Package-Manager: portage-2.2.26 |
14 |
|
15 |
.../files/libvirt-1.2.22-do_not_use_sysconf.patch | 100 +++++++++++++++++++++ |
16 |
app-emulation/libvirt/libvirt-9999.ebuild | 2 +- |
17 |
2 files changed, 101 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch |
20 |
new file mode 100644 |
21 |
index 0000000..3296513 |
22 |
--- /dev/null |
23 |
+++ b/app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch |
24 |
@@ -0,0 +1,100 @@ |
25 |
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am |
26 |
+index be1b5a9..5ce0e1e 100644 |
27 |
+--- a/daemon/Makefile.am |
28 |
++++ b/daemon/Makefile.am |
29 |
+@@ -385,9 +385,7 @@ uninstall-logrotate: |
30 |
+ rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : |
31 |
+ |
32 |
+ install-sysconfig: |
33 |
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
34 |
+- $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ |
35 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd |
36 |
++ |
37 |
+ uninstall-sysconfig: |
38 |
+ rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd |
39 |
+ rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
40 |
+diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in |
41 |
+index 9e67e43..68a32f8 100644 |
42 |
+--- a/daemon/libvirtd.service.in |
43 |
++++ b/daemon/libvirtd.service.in |
44 |
+@@ -12,8 +12,7 @@ Documentation=http://libvirt.org |
45 |
+ |
46 |
+ [Service] |
47 |
+ Type=notify |
48 |
+-EnvironmentFile=-/etc/sysconfig/libvirtd |
49 |
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
50 |
++ExecStart=@sbindir@/libvirtd |
51 |
+ ExecReload=/bin/kill -HUP $MAINPID |
52 |
+ KillMode=process |
53 |
+ Restart=on-failure |
54 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
55 |
+index 7219f7c..c474a23 100644 |
56 |
+--- a/src/Makefile.am |
57 |
++++ b/src/Makefile.am |
58 |
+@@ -2473,11 +2473,6 @@ EXTRA_DIST += \ |
59 |
+ logging/virtlogd.sysconf |
60 |
+ |
61 |
+ install-sysconfig: |
62 |
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
63 |
+- $(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \ |
64 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd |
65 |
+- $(INSTALL_DATA) $(srcdir)/logging/virtlogd.sysconf \ |
66 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd |
67 |
+ |
68 |
+ uninstall-sysconfig: |
69 |
+ rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd |
70 |
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in |
71 |
+index 57089b0..ace0c83 100644 |
72 |
+--- a/src/locking/virtlockd.service.in |
73 |
++++ b/src/locking/virtlockd.service.in |
74 |
+@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8) |
75 |
+ Documentation=http://libvirt.org |
76 |
+ |
77 |
+ [Service] |
78 |
+-EnvironmentFile=-/etc/sysconfig/virtlockd |
79 |
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
80 |
++ExecStart=@sbindir@/virtlockd |
81 |
+ ExecReload=/bin/kill -USR1 $MAINPID |
82 |
+ # Loosing the locks is a really bad thing that will |
83 |
+ # cause the machine to be fenced (rebooted), so make |
84 |
+diff --git a/tools/Makefile.am b/tools/Makefile.am |
85 |
+index 9180564..e72d5f4 100644 |
86 |
+--- a/tools/Makefile.am |
87 |
++++ b/tools/Makefile.am |
88 |
+@@ -293,7 +293,7 @@ uninstall-local: uninstall-init uninstall-systemd |
89 |
+ install-sysconfig: |
90 |
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
91 |
+ $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
92 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
93 |
++ $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf |
94 |
+ |
95 |
+ uninstall-sysconfig: |
96 |
+ rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
97 |
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in |
98 |
+index c31f663..71cb79d 100644 |
99 |
+--- a/tools/libvirt-guests.service.in |
100 |
++++ b/tools/libvirt-guests.service.in |
101 |
+@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8) |
102 |
+ Documentation=http://libvirt.org |
103 |
+ |
104 |
+ [Service] |
105 |
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests |
106 |
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
107 |
+ # Hack just call traditional service until we factor |
108 |
+ # out the code |
109 |
+ ExecStart=@libexecdir@/libvirt-guests.sh start |
110 |
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf |
111 |
+index 2770056..accd4f5 100644 |
112 |
+--- a/tools/libvirt-guests.sysconf |
113 |
++++ b/tools/libvirt-guests.sysconf |
114 |
+@@ -1,3 +1,10 @@ |
115 |
++# |
116 |
++# Warning: This configuration file is only sourced by the systemd |
117 |
++# libvirt-guests.service unit. The coresponding openrc facility is in |
118 |
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
119 |
++# |
120 |
++ |
121 |
++ |
122 |
+ # URIs to check for running guests |
123 |
+ # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' |
124 |
+ #URIS=default |
125 |
|
126 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
127 |
index 724342a..928b9d5 100644 |
128 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
129 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
130 |
@@ -218,7 +218,7 @@ src_prepare() { |
131 |
fi |
132 |
|
133 |
epatch \ |
134 |
- "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \ |
135 |
+ "${FILESDIR}"/${PN}-1.2.22-do_not_use_sysconf.patch \ |
136 |
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ |
137 |
"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch |