1 |
commit: be4417b793846de3ccc0290888d2666280547462 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 29 04:12:26 2018 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 29 04:12:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4417b7 |
7 |
|
8 |
app-emulation/libvirt: drop old patches |
9 |
|
10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
11 |
|
12 |
.../files/libvirt-4.1.0-do_not_use_sysconf.patch | 204 --------------------- |
13 |
.../files/libvirt-4.1.0-unbreak_my_bridge.patch | 78 -------- |
14 |
2 files changed, 282 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch |
17 |
deleted file mode 100644 |
18 |
index 2c8339a8b51..00000000000 |
19 |
--- a/app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch |
20 |
+++ /dev/null |
21 |
@@ -1,204 +0,0 @@ |
22 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
23 |
-index 3bf2da5..6b3f37a 100644 |
24 |
---- a/src/Makefile.am |
25 |
-+++ b/src/Makefile.am |
26 |
-@@ -2165,23 +2165,6 @@ EXTRA_DIST += \ |
27 |
- $(SYSCONF_FILES) \ |
28 |
- $(NULL) |
29 |
- |
30 |
--install-sysconfig: |
31 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
32 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
33 |
-- do \ |
34 |
-- tgt=`basename $$f`; \ |
35 |
-- $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf \ |
36 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
37 |
-- done |
38 |
-- |
39 |
--uninstall-sysconfig: |
40 |
-- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
41 |
-- do \ |
42 |
-- tgt=`basename $$f`; \ |
43 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
44 |
-- done |
45 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
46 |
-- |
47 |
- SYSVINIT_FILES_IN = \ |
48 |
- locking/virtlockd.init.in \ |
49 |
- logging/virtlogd.init.in \ |
50 |
-@@ -2268,14 +2251,14 @@ uninstall-polkit:: |
51 |
- endif ! WITH_POLKIT |
52 |
- |
53 |
- if LIBVIRT_INIT_SCRIPT_RED_HAT |
54 |
--install-init:: $(SYSVINIT_FILES) install-sysconfig |
55 |
-+install-init:: $(SYSVINIT_FILES) |
56 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d |
57 |
- for f in $(SYSVINIT_FILES:%.init=%) ; \ |
58 |
- do \ |
59 |
- $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/$$f; \ |
60 |
- done |
61 |
- |
62 |
--uninstall-init:: uninstall-sysconfig |
63 |
-+uninstall-init:: |
64 |
- rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%) |
65 |
- rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : |
66 |
- |
67 |
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in |
68 |
-index 3c9d587..2449b20 100644 |
69 |
---- a/src/locking/virtlockd.service.in |
70 |
-+++ b/src/locking/virtlockd.service.in |
71 |
-@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) |
72 |
- Documentation=https://libvirt.org |
73 |
- |
74 |
- [Service] |
75 |
--EnvironmentFile=-/etc/sysconfig/virtlockd |
76 |
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
77 |
-+ExecStart=@sbindir@/virtlockd |
78 |
- ExecReload=/bin/kill -USR1 $MAINPID |
79 |
- # Loosing the locks is a really bad thing that will |
80 |
- # cause the machine to be fenced (rebooted), so make |
81 |
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in |
82 |
-index 3d9ae36..4373619 100644 |
83 |
---- a/src/logging/virtlogd.service.in |
84 |
-+++ b/src/logging/virtlogd.service.in |
85 |
-@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) |
86 |
- Documentation=https://libvirt.org |
87 |
- |
88 |
- [Service] |
89 |
--EnvironmentFile=-/etc/sysconfig/virtlogd |
90 |
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
91 |
-+ExecStart=@sbindir@/virtlogd |
92 |
- ExecReload=/bin/kill -USR1 $MAINPID |
93 |
- # Loosing the logs is a really bad thing that will |
94 |
- # cause the machine to be fenced (rebooted), so make |
95 |
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in |
96 |
-index 769702e..1830c72 100644 |
97 |
---- a/src/remote/libvirtd.service.in |
98 |
-+++ b/src/remote/libvirtd.service.in |
99 |
-@@ -21,8 +21,7 @@ Documentation=https://libvirt.org |
100 |
- |
101 |
- [Service] |
102 |
- Type=notify |
103 |
--EnvironmentFile=-/etc/sysconfig/libvirtd |
104 |
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
105 |
-+ExecStart=@sbindir@/libvirtd |
106 |
- ExecReload=/bin/kill -HUP $MAINPID |
107 |
- KillMode=process |
108 |
- Restart=on-failure |
109 |
-diff --git a/tools/Makefile.am b/tools/Makefile.am |
110 |
-index 85e640b..99b9fa1 100644 |
111 |
---- a/tools/Makefile.am |
112 |
-+++ b/tools/Makefile.am |
113 |
-@@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \ |
114 |
- uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ |
115 |
- uninstall-bash-completion |
116 |
- |
117 |
--install-sysconfig: |
118 |
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
119 |
-- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
120 |
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
121 |
-- |
122 |
--uninstall-sysconfig: |
123 |
-- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
124 |
-- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: |
125 |
-- |
126 |
- EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in |
127 |
- |
128 |
- install-initscript: libvirt-guests.init |
129 |
-@@ -359,8 +350,8 @@ uninstall-initscript: |
130 |
- |
131 |
- if LIBVIRT_INIT_SCRIPT_RED_HAT |
132 |
- BUILT_SOURCES += libvirt-guests.init |
133 |
--install-init: install-sysconfig install-initscript |
134 |
--uninstall-init: uninstall-sysconfig uninstall-initscript |
135 |
-+install-init: install-initscript |
136 |
-+uninstall-init: uninstall-initscript |
137 |
- else ! LIBVIRT_INIT_SCRIPT_RED_HAT |
138 |
- install-init: |
139 |
- uninstall-init: |
140 |
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in |
141 |
-index 491ca62..f0f417b 100644 |
142 |
---- a/tools/libvirt-guests.service.in |
143 |
-+++ b/tools/libvirt-guests.service.in |
144 |
-@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) |
145 |
- Documentation=https://libvirt.org |
146 |
- |
147 |
- [Service] |
148 |
--EnvironmentFile=-/etc/sysconfig/libvirt-guests |
149 |
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
150 |
- # Hack just call traditional service until we factor |
151 |
- # out the code |
152 |
- ExecStart=@libexecdir@/libvirt-guests.sh start |
153 |
-diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf |
154 |
-index 08204ca..2da172b 100644 |
155 |
---- a/tools/libvirt-guests.sysconf |
156 |
-+++ b/tools/libvirt-guests.sysconf |
157 |
-@@ -1,3 +1,10 @@ |
158 |
-+# |
159 |
-+# Warning: This configuration file is only sourced by the systemd |
160 |
-+# libvirt-guests.service unit. The coresponding openrc facility is in |
161 |
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
162 |
-+# |
163 |
-+ |
164 |
-+ |
165 |
- # URIs to check for running guests |
166 |
- # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' |
167 |
- #URIS=default |
168 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
169 |
-index 6b3f37a..48e7133 100644 |
170 |
---- a/src/Makefile.am |
171 |
-+++ b/src/Makefile.am |
172 |
-@@ -2417,14 +2417,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) |
173 |
- BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) |
174 |
- DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) |
175 |
- |
176 |
--install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig |
177 |
-+install-systemd: $(SYSTEMD_UNIT_FILES) |
178 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
179 |
- for f in $(SYSTEMD_UNIT_FILES); \ |
180 |
- do \ |
181 |
- $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ |
182 |
- done |
183 |
- |
184 |
--uninstall-systemd: uninstall-sysconfig |
185 |
-+uninstall-systemd: |
186 |
- rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) |
187 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : |
188 |
- else ! LIBVIRT_INIT_SCRIPT_SYSTEMD |
189 |
-@@ -2496,7 +2496,7 @@ EXTRA_DIST += $(UPSTART_FILES) |
190 |
- if WITH_LIBVIRTD |
191 |
- if LIBVIRT_INIT_SCRIPT_UPSTART |
192 |
- |
193 |
--install-upstart: install-sysconfig |
194 |
-+install-upstart: |
195 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d |
196 |
- for f in $(UPSTART_FILES:%.upstart=%); \ |
197 |
- do \ |
198 |
-@@ -2505,7 +2505,7 @@ install-upstart: install-sysconfig |
199 |
- $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ |
200 |
- done |
201 |
- |
202 |
--uninstall-upstart: uninstall-sysconfig |
203 |
-+uninstall-upstart: |
204 |
- for f in $(UPSTART_FILES:%.upstart=%); \ |
205 |
- do \ |
206 |
- tgt=`basename $$f` ; \ |
207 |
-diff --git a/tools/Makefile.am b/tools/Makefile.am |
208 |
-index 99b9fa1..37e037c 100644 |
209 |
---- a/tools/Makefile.am |
210 |
-+++ b/tools/Makefile.am |
211 |
-@@ -382,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in |
212 |
- SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
213 |
- |
214 |
- if LIBVIRT_INIT_SCRIPT_SYSTEMD |
215 |
--install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
216 |
-+install-systemd: libvirt-guests.service libvirt-guests.sh |
217 |
- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
218 |
- $(INSTALL_DATA) libvirt-guests.service \ |
219 |
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
220 |
- |
221 |
--uninstall-systemd: uninstall-sysconfig |
222 |
-+uninstall-systemd: |
223 |
- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
224 |
- rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: |
225 |
- |
226 |
|
227 |
diff --git a/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch b/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch |
228 |
deleted file mode 100644 |
229 |
index c4d24ec020b..00000000000 |
230 |
--- a/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch |
231 |
+++ /dev/null |
232 |
@@ -1,78 +0,0 @@ |
233 |
-[PATCH] conf: avoid reporting errors when network driver is disabled |
234 |
- |
235 |
-In previous releases all these methods were a no-op if the network |
236 |
-driver is disabled. These helper methods are called unconditionally for |
237 |
-all types of network interface, so must be no-ops if missing. Other code |
238 |
-will already generate an error if the network driver is disabled and a |
239 |
-NIC with type=network is used. |
240 |
- |
241 |
-Signed-off-by: Daniel P. Berrangé <berrange redhat com> |
242 |
---- |
243 |
- src/conf/domain_conf.c | 23 +++++++++-------------- |
244 |
- 1 file changed, 9 insertions(+), 14 deletions(-) |
245 |
- |
246 |
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c |
247 |
-index c8d051fa9f..79d6bd378e 100644 |
248 |
---- a/src/conf/domain_conf.c |
249 |
-+++ b/src/conf/domain_conf.c |
250 |
-@@ -28979,10 +28979,13 @@ int |
251 |
- virDomainNetAllocateActualDevice(virDomainDefPtr dom, |
252 |
- virDomainNetDefPtr iface) |
253 |
- { |
254 |
-+ /* Just silently ignore if network driver isn't present. If something |
255 |
-+ * has tried to use a NIC with type=network, other code will already |
256 |
-+ * cause an error. This ensures type=bridge doesn't break when |
257 |
-+ * network driver is compiled out. |
258 |
-+ */ |
259 |
- if (!netAllocate) { |
260 |
-- virReportError(VIR_ERR_NO_SUPPORT, "%s", |
261 |
-- _("Network device allocation not available")); |
262 |
-- return -1; |
263 |
-+ return 0; |
264 |
- } |
265 |
- |
266 |
- return netAllocate(dom, iface); |
267 |
-@@ -28993,8 +28996,6 @@ virDomainNetNotifyActualDevice(virDomainDefPtr dom, |
268 |
- virDomainNetDefPtr iface) |
269 |
- { |
270 |
- if (!netNotify) { |
271 |
-- virReportError(VIR_ERR_NO_SUPPORT, "%s", |
272 |
-- _("Network device notification not available")); |
273 |
- return; |
274 |
- } |
275 |
- |
276 |
-@@ -29007,9 +29008,7 @@ virDomainNetReleaseActualDevice(virDomainDefPtr dom, |
277 |
- virDomainNetDefPtr iface) |
278 |
- { |
279 |
- if (!netRelease) { |
280 |
-- virReportError(VIR_ERR_NO_SUPPORT, "%s", |
281 |
-- _("Network device release not available")); |
282 |
-- return -1; |
283 |
-+ return 0; |
284 |
- } |
285 |
- |
286 |
- return netRelease(dom, iface); |
287 |
-@@ -29020,9 +29019,7 @@ virDomainNetBandwidthChangeAllowed(virDomainNetDefPtr iface, |
288 |
- virNetDevBandwidthPtr newBandwidth) |
289 |
- { |
290 |
- if (!netBandwidthChangeAllowed) { |
291 |
-- virReportError(VIR_ERR_NO_SUPPORT, "%s", |
292 |
-- _("Network device bandwidth change query not available")); |
293 |
-- return -1; |
294 |
-+ return 0; |
295 |
- } |
296 |
- |
297 |
- return netBandwidthChangeAllowed(iface, newBandwidth); |
298 |
-@@ -29033,9 +29030,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface, |
299 |
- virNetDevBandwidthPtr newBandwidth) |
300 |
- { |
301 |
- if (!netBandwidthUpdate) { |
302 |
-- virReportError(VIR_ERR_NO_SUPPORT, "%s", |
303 |
-- _("Network device bandwidth update not available")); |
304 |
-- return -1; |
305 |
-+ return 0; |
306 |
- } |
307 |
- |
308 |
- return netBandwidthUpdate(iface, newBandwidth); |
309 |
--- |
310 |
-2.14.3 |