1 |
commit: 7bc2be1ebb665a5152bf35cfaf1be055d239b06d |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Mon Apr 4 07:48:47 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 4 07:48:47 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc2be1e |
7 |
|
8 |
app-emulation/libvirt: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/24892 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../files/libvirt-8.1.0-do-not-use-sysconfig.patch | 208 --------------------- |
16 |
1 file changed, 208 deletions(-) |
17 |
|
18 |
diff --git a/app-emulation/libvirt/files/libvirt-8.1.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-8.1.0-do-not-use-sysconfig.patch |
19 |
deleted file mode 100644 |
20 |
index ec957cf51784..000000000000 |
21 |
--- a/app-emulation/libvirt/files/libvirt-8.1.0-do-not-use-sysconfig.patch |
22 |
+++ /dev/null |
23 |
@@ -1,208 +0,0 @@ |
24 |
-From e669d8bdc18a04154b10f0a21ee3f7c4141d2a42 Mon Sep 17 00:00:00 2001 |
25 |
-Message-Id: <e669d8bdc18a04154b10f0a21ee3f7c4141d2a42.1642669122.git.mprivozn@××××××.com> |
26 |
-From: Michal Privoznik <mprivozn@××××××.com> |
27 |
-Date: Thu, 20 Jan 2022 09:39:58 +0100 |
28 |
-Subject: [PATCH] do not use sysconfig |
29 |
- |
30 |
-Signed-off-by: Michal Privoznik <mprivozn@××××××.com> |
31 |
---- |
32 |
- src/interface/virtinterfaced.service.in | 1 - |
33 |
- src/libxl/virtxend.service.in | 1 - |
34 |
- src/locking/virtlockd.service.in | 1 - |
35 |
- src/logging/virtlogd.service.in | 1 - |
36 |
- src/lxc/virtlxcd.service.in | 1 - |
37 |
- src/network/virtnetworkd.service.in | 1 - |
38 |
- src/node_device/virtnodedevd.service.in | 1 - |
39 |
- src/nwfilter/virtnwfilterd.service.in | 1 - |
40 |
- src/qemu/virtqemud.service.in | 1 - |
41 |
- src/remote/libvirtd.service.in | 1 - |
42 |
- src/remote/virtproxyd.service.in | 1 - |
43 |
- src/secret/virtsecretd.service.in | 1 - |
44 |
- src/storage/virtstoraged.service.in | 1 - |
45 |
- src/vbox/virtvboxd.service.in | 1 - |
46 |
- tools/libvirt-guests.service.in | 1 - |
47 |
- 15 files changed, 15 deletions(-) |
48 |
- |
49 |
-diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in |
50 |
-index 3d944e17a9..1d94f3c943 100644 |
51 |
---- a/src/interface/virtinterfaced.service.in |
52 |
-+++ b/src/interface/virtinterfaced.service.in |
53 |
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org |
54 |
- [Service] |
55 |
- Type=notify |
56 |
- Environment=VIRTINTERFACED_ARGS="--timeout 120" |
57 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced |
58 |
- ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS |
59 |
- ExecReload=/bin/kill -HUP $MAINPID |
60 |
- Restart=on-failure |
61 |
-diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in |
62 |
-index 2b5163e179..4edfdeb719 100644 |
63 |
---- a/src/libxl/virtxend.service.in |
64 |
-+++ b/src/libxl/virtxend.service.in |
65 |
-@@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities |
66 |
- [Service] |
67 |
- Type=notify |
68 |
- Environment=VIRTXEND_ARGS="--timeout 120" |
69 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtxend |
70 |
- ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS |
71 |
- ExecReload=/bin/kill -HUP $MAINPID |
72 |
- Restart=on-failure |
73 |
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in |
74 |
-index 19271d1e7d..87193952cb 100644 |
75 |
---- a/src/locking/virtlockd.service.in |
76 |
-+++ b/src/locking/virtlockd.service.in |
77 |
-@@ -8,7 +8,6 @@ Documentation=https://libvirt.org |
78 |
- |
79 |
- [Service] |
80 |
- Environment=VIRTLOCKD_ARGS= |
81 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd |
82 |
- ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
83 |
- ExecReload=/bin/kill -USR1 $MAINPID |
84 |
- # Losing the locks is a really bad thing that will |
85 |
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in |
86 |
-index 8ab5478517..a734e0ef9d 100644 |
87 |
---- a/src/logging/virtlogd.service.in |
88 |
-+++ b/src/logging/virtlogd.service.in |
89 |
-@@ -7,7 +7,6 @@ Documentation=man:virtlogd(8) |
90 |
- Documentation=https://libvirt.org |
91 |
- |
92 |
- [Service] |
93 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd |
94 |
- ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
95 |
- ExecReload=/bin/kill -USR1 $MAINPID |
96 |
- # Losing the logs is a really bad thing that will |
97 |
-diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in |
98 |
-index d58bde9f5d..c5c2bb31e4 100644 |
99 |
---- a/src/lxc/virtlxcd.service.in |
100 |
-+++ b/src/lxc/virtlxcd.service.in |
101 |
-@@ -19,7 +19,6 @@ Documentation=https://libvirt.org |
102 |
- [Service] |
103 |
- Type=notify |
104 |
- Environment=VIRTLXCD_ARGS="--timeout 120" |
105 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd |
106 |
- ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS |
107 |
- ExecReload=/bin/kill -HUP $MAINPID |
108 |
- KillMode=process |
109 |
-diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in |
110 |
-index 3decfbbf1d..c7c57fdd44 100644 |
111 |
---- a/src/network/virtnetworkd.service.in |
112 |
-+++ b/src/network/virtnetworkd.service.in |
113 |
-@@ -17,7 +17,6 @@ Documentation=https://libvirt.org |
114 |
- [Service] |
115 |
- Type=notify |
116 |
- Environment=VIRTNETWORKD_ARGS="--timeout 120" |
117 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd |
118 |
- ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS |
119 |
- ExecReload=/bin/kill -HUP $MAINPID |
120 |
- Restart=on-failure |
121 |
-diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in |
122 |
-index 688cf89822..41c7a0f0f0 100644 |
123 |
---- a/src/node_device/virtnodedevd.service.in |
124 |
-+++ b/src/node_device/virtnodedevd.service.in |
125 |
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org |
126 |
- [Service] |
127 |
- Type=notify |
128 |
- Environment=VIRTNODEDEVD_ARGS="--timeout 120" |
129 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd |
130 |
- ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS |
131 |
- ExecReload=/bin/kill -HUP $MAINPID |
132 |
- Restart=on-failure |
133 |
-diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in |
134 |
-index 36d00b58f0..d422bfeca1 100644 |
135 |
---- a/src/nwfilter/virtnwfilterd.service.in |
136 |
-+++ b/src/nwfilter/virtnwfilterd.service.in |
137 |
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org |
138 |
- [Service] |
139 |
- Type=notify |
140 |
- Environment=VIRTNWFILTERD_ARGS="--timeout 120" |
141 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd |
142 |
- ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS |
143 |
- ExecReload=/bin/kill -HUP $MAINPID |
144 |
- Restart=on-failure |
145 |
-diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in |
146 |
-index 551eb4d405..4c0344aad2 100644 |
147 |
---- a/src/qemu/virtqemud.service.in |
148 |
-+++ b/src/qemu/virtqemud.service.in |
149 |
-@@ -21,7 +21,6 @@ Documentation=https://libvirt.org |
150 |
- [Service] |
151 |
- Type=notify |
152 |
- Environment=VIRTQEMUD_ARGS="--timeout 120" |
153 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud |
154 |
- ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS |
155 |
- ExecReload=/bin/kill -HUP $MAINPID |
156 |
- KillMode=process |
157 |
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in |
158 |
-index 5d4d412fcc..27cfc34b90 100644 |
159 |
---- a/src/remote/libvirtd.service.in |
160 |
-+++ b/src/remote/libvirtd.service.in |
161 |
-@@ -29,7 +29,6 @@ Documentation=https://libvirt.org |
162 |
- [Service] |
163 |
- Type=notify |
164 |
- Environment=LIBVIRTD_ARGS="--timeout 120" |
165 |
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd |
166 |
- ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
167 |
- ExecReload=/bin/kill -HUP $MAINPID |
168 |
- KillMode=process |
169 |
-diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in |
170 |
-index 10e8cf7263..5fc887fe4a 100644 |
171 |
---- a/src/remote/virtproxyd.service.in |
172 |
-+++ b/src/remote/virtproxyd.service.in |
173 |
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org |
174 |
- [Service] |
175 |
- Type=notify |
176 |
- Environment=VIRTPROXYD_ARGS="--timeout 120" |
177 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd |
178 |
- ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS |
179 |
- ExecReload=/bin/kill -HUP $MAINPID |
180 |
- Restart=on-failure |
181 |
-diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in |
182 |
-index cbd63fe0b2..bdf96ea0b1 100644 |
183 |
---- a/src/secret/virtsecretd.service.in |
184 |
-+++ b/src/secret/virtsecretd.service.in |
185 |
-@@ -14,7 +14,6 @@ Documentation=https://libvirt.org |
186 |
- [Service] |
187 |
- Type=notify |
188 |
- Environment=VIRTSECRETD_ARGS="--timeout 120" |
189 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd |
190 |
- ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS |
191 |
- ExecReload=/bin/kill -HUP $MAINPID |
192 |
- Restart=on-failure |
193 |
-diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in |
194 |
-index f72f8426fd..6e865e53e7 100644 |
195 |
---- a/src/storage/virtstoraged.service.in |
196 |
-+++ b/src/storage/virtstoraged.service.in |
197 |
-@@ -16,7 +16,6 @@ Documentation=https://libvirt.org |
198 |
- [Service] |
199 |
- Type=notify |
200 |
- Environment=VIRTSTORAGED_ARGS="--timeout 120" |
201 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged |
202 |
- ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS |
203 |
- ExecReload=/bin/kill -HUP $MAINPID |
204 |
- Restart=on-failure |
205 |
-diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in |
206 |
-index cfdafc39d2..a1108e60f8 100644 |
207 |
---- a/src/vbox/virtvboxd.service.in |
208 |
-+++ b/src/vbox/virtvboxd.service.in |
209 |
-@@ -15,7 +15,6 @@ Documentation=https://libvirt.org |
210 |
- [Service] |
211 |
- Type=notify |
212 |
- Environment=VIRTVBOXD_ARGS="--timeout 120" |
213 |
--EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd |
214 |
- ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS |
215 |
- ExecReload=/bin/kill -HUP $MAINPID |
216 |
- Restart=on-failure |
217 |
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in |
218 |
-index 1a9b233e11..765b777536 100644 |
219 |
---- a/tools/libvirt-guests.service.in |
220 |
-+++ b/tools/libvirt-guests.service.in |
221 |
-@@ -10,7 +10,6 @@ Documentation=man:libvirt-guests(8) |
222 |
- Documentation=https://libvirt.org |
223 |
- |
224 |
- [Service] |
225 |
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests |
226 |
- # Hack just call traditional service until we factor |
227 |
- # out the code |
228 |
- ExecStart=@libexecdir@/libvirt-guests.sh start |
229 |
--- |
230 |
-2.34.1 |
231 |
- |