1 |
commit: 8b5293f550c56fc2ad05540cb245d8ac60a024ed |
2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
3 |
AuthorDate: Fri Jan 25 15:24:13 2019 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 25 16:24:22 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5293f5 |
7 |
|
8 |
app-emulation/libvirt: Rebase libvirt-5.0.0-do-not-use-sysconf.patch |
9 |
|
10 |
In the upstream, the Makefile.am file that the patch is fixing |
11 |
was changed leaving the patch failing to apply. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/676026 |
14 |
|
15 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
16 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
17 |
|
18 |
.../files/libvirt-5.1.0-do-not-use-sysconf.patch | 216 +++++++++++++++++++++ |
19 |
app-emulation/libvirt/libvirt-9999.ebuild | 2 +- |
20 |
2 files changed, 217 insertions(+), 1 deletion(-) |
21 |
|
22 |
diff --git a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..3c32ab81f1d |
25 |
--- /dev/null |
26 |
+++ b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch |
27 |
@@ -0,0 +1,216 @@ |
28 |
+From cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27 Mon Sep 17 00:00:00 2001 |
29 |
+Message-Id: <cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27.1548428073.git.mprivozn@××××××.com> |
30 |
+From: Michal Privoznik <mprivozn@××××××.com> |
31 |
+Date: Tue, 26 Jun 2018 06:51:06 +0200 |
32 |
+Subject: [PATCH] gentoo: do not use sysconf |
33 |
+ |
34 |
+Signed-off-by: Michal Privoznik <mprivozn@××××××.com> |
35 |
+--- |
36 |
+ src/Makefile.am | 29 ++++++----------------------- |
37 |
+ src/locking/virtlockd.service.in | 3 +-- |
38 |
+ src/logging/virtlogd.service.in | 3 +-- |
39 |
+ src/remote/libvirtd.service.in | 3 +-- |
40 |
+ tools/Makefile.am | 17 ++++------------- |
41 |
+ tools/libvirt-guests.service.in | 2 +- |
42 |
+ tools/libvirt-guests.sysconf | 7 +++++++ |
43 |
+ 7 files changed, 21 insertions(+), 43 deletions(-) |
44 |
+ |
45 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
46 |
+index 8c8dfe3dcf..25ced3abf3 100644 |
47 |
+--- a/src/Makefile.am |
48 |
++++ b/src/Makefile.am |
49 |
+@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT |
50 |
+ |
51 |
+ EXTRA_DIST += $(SYSCONF_FILES) |
52 |
+ |
53 |
+-install-sysconfig: |
54 |
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
55 |
+- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
56 |
+- do \ |
57 |
+- tgt=`basename $$f`; \ |
58 |
+- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ |
59 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
60 |
+- done |
61 |
+- |
62 |
+-uninstall-sysconfig: |
63 |
+- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ |
64 |
+- do \ |
65 |
+- tgt=`basename $$f`; \ |
66 |
+- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ |
67 |
+- done |
68 |
+- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
69 |
+- |
70 |
+ SYSVINIT_FILES_IN += \ |
71 |
+ locking/virtlockd.init.in \ |
72 |
+ $(NULL) |
73 |
+@@ -816,14 +799,14 @@ if WITH_LIBVIRTD |
74 |
+ if LIBVIRT_INIT_SCRIPT_RED_HAT |
75 |
+ initdir = $(sysconfdir)/rc.d/init.d |
76 |
+ |
77 |
+-install-init: $(SYSVINIT_FILES) install-sysconfig |
78 |
++install-init: $(SYSVINIT_FILES) |
79 |
+ $(MKDIR_P) $(DESTDIR)$(initdir) |
80 |
+ for f in $(SYSVINIT_FILES:%.init=%) ; \ |
81 |
+ do \ |
82 |
+ $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \ |
83 |
+ done |
84 |
+ |
85 |
+-uninstall-init: uninstall-sysconfig |
86 |
++uninstall-init: |
87 |
+ rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%) |
88 |
+ rmdir $(DESTDIR)$(initdir) || : |
89 |
+ |
90 |
+@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) |
91 |
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) |
92 |
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) |
93 |
+ |
94 |
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig |
95 |
++install-systemd: $(SYSTEMD_UNIT_FILES) |
96 |
+ $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
97 |
+ for f in $(SYSTEMD_UNIT_FILES); \ |
98 |
+ do \ |
99 |
+ $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ |
100 |
+ done |
101 |
+ |
102 |
+-uninstall-systemd: uninstall-sysconfig |
103 |
++uninstall-systemd: |
104 |
+ rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) |
105 |
+ rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : |
106 |
+ |
107 |
+@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES) |
108 |
+ if WITH_LIBVIRTD |
109 |
+ if LIBVIRT_INIT_SCRIPT_UPSTART |
110 |
+ |
111 |
+-install-upstart: install-sysconfig |
112 |
++install-upstart: |
113 |
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d |
114 |
+ for f in $(UPSTART_FILES:%.upstart=%); \ |
115 |
+ do \ |
116 |
+@@ -893,7 +876,7 @@ install-upstart: install-sysconfig |
117 |
+ $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ |
118 |
+ done |
119 |
+ |
120 |
+-uninstall-upstart: uninstall-sysconfig |
121 |
++uninstall-upstart: |
122 |
+ for f in $(UPSTART_FILES:%.upstart=%); \ |
123 |
+ do \ |
124 |
+ tgt=`basename $$f` ; \ |
125 |
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in |
126 |
+index 3c9d587032..2449b201d9 100644 |
127 |
+--- a/src/locking/virtlockd.service.in |
128 |
++++ b/src/locking/virtlockd.service.in |
129 |
+@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) |
130 |
+ Documentation=https://libvirt.org |
131 |
+ |
132 |
+ [Service] |
133 |
+-EnvironmentFile=-/etc/sysconfig/virtlockd |
134 |
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS |
135 |
++ExecStart=@sbindir@/virtlockd |
136 |
+ ExecReload=/bin/kill -USR1 $MAINPID |
137 |
+ # Loosing the locks is a really bad thing that will |
138 |
+ # cause the machine to be fenced (rebooted), so make |
139 |
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in |
140 |
+index 3d9ae36150..43736191d5 100644 |
141 |
+--- a/src/logging/virtlogd.service.in |
142 |
++++ b/src/logging/virtlogd.service.in |
143 |
+@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) |
144 |
+ Documentation=https://libvirt.org |
145 |
+ |
146 |
+ [Service] |
147 |
+-EnvironmentFile=-/etc/sysconfig/virtlogd |
148 |
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS |
149 |
++ExecStart=@sbindir@/virtlogd |
150 |
+ ExecReload=/bin/kill -USR1 $MAINPID |
151 |
+ # Loosing the logs is a really bad thing that will |
152 |
+ # cause the machine to be fenced (rebooted), so make |
153 |
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in |
154 |
+index 7f689e08a8..239beeced9 100644 |
155 |
+--- a/src/remote/libvirtd.service.in |
156 |
++++ b/src/remote/libvirtd.service.in |
157 |
+@@ -22,8 +22,7 @@ Documentation=https://libvirt.org |
158 |
+ |
159 |
+ [Service] |
160 |
+ Type=notify |
161 |
+-EnvironmentFile=-/etc/sysconfig/libvirtd |
162 |
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS |
163 |
++ExecStart=@sbindir@/libvirtd |
164 |
+ ExecReload=/bin/kill -HUP $MAINPID |
165 |
+ KillMode=process |
166 |
+ Restart=on-failure |
167 |
+diff --git a/tools/Makefile.am b/tools/Makefile.am |
168 |
+index 613c9a77f0..224b511074 100644 |
169 |
+--- a/tools/Makefile.am |
170 |
++++ b/tools/Makefile.am |
171 |
+@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \ |
172 |
+ uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ |
173 |
+ uninstall-bash-completion |
174 |
+ |
175 |
+-install-sysconfig: |
176 |
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
177 |
+- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ |
178 |
+- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
179 |
+- |
180 |
+-uninstall-sysconfig: |
181 |
+- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests |
182 |
+- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: |
183 |
+- |
184 |
+ EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in |
185 |
+ |
186 |
+ install-initscript: libvirt-guests.init |
187 |
+@@ -362,8 +353,8 @@ uninstall-initscript: |
188 |
+ |
189 |
+ if LIBVIRT_INIT_SCRIPT_RED_HAT |
190 |
+ BUILT_SOURCES += libvirt-guests.init |
191 |
+-install-init: install-sysconfig install-initscript |
192 |
+-uninstall-init: uninstall-sysconfig uninstall-initscript |
193 |
++install-init: install-initscript |
194 |
++uninstall-init: uninstall-initscript |
195 |
+ else ! LIBVIRT_INIT_SCRIPT_RED_HAT |
196 |
+ install-init: |
197 |
+ uninstall-init: |
198 |
+@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in |
199 |
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
200 |
+ |
201 |
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD |
202 |
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
203 |
++install-systemd: libvirt-guests.service libvirt-guests.sh |
204 |
+ $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) |
205 |
+ $(INSTALL_DATA) libvirt-guests.service \ |
206 |
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
207 |
+ |
208 |
+-uninstall-systemd: uninstall-sysconfig |
209 |
++uninstall-systemd: |
210 |
+ rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service |
211 |
+ rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: |
212 |
+ |
213 |
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in |
214 |
+index 491ca62138..f0f417bffb 100644 |
215 |
+--- a/tools/libvirt-guests.service.in |
216 |
++++ b/tools/libvirt-guests.service.in |
217 |
+@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) |
218 |
+ Documentation=https://libvirt.org |
219 |
+ |
220 |
+ [Service] |
221 |
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests |
222 |
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf |
223 |
+ # Hack just call traditional service until we factor |
224 |
+ # out the code |
225 |
+ ExecStart=@libexecdir@/libvirt-guests.sh start |
226 |
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf |
227 |
+index 669b046507..45b0b9ea46 100644 |
228 |
+--- a/tools/libvirt-guests.sysconf |
229 |
++++ b/tools/libvirt-guests.sysconf |
230 |
+@@ -1,3 +1,10 @@ |
231 |
++# |
232 |
++# Warning: This configuration file is only sourced by the systemd |
233 |
++# libvirt-guests.service unit. The coresponding openrc facility is in |
234 |
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd |
235 |
++# |
236 |
++ |
237 |
++ |
238 |
+ # URIs to check for running guests |
239 |
+ # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' |
240 |
+ #URIS=default |
241 |
+-- |
242 |
+2.19.2 |
243 |
+ |
244 |
|
245 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
246 |
index 158a315e310..52082872960 100644 |
247 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
248 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
249 |
@@ -124,7 +124,7 @@ DEPEND="${RDEPEND} |
250 |
virtual/pkgconfig" |
251 |
|
252 |
PATCHES=( |
253 |
- "${FILESDIR}"/${PN}-5.0.0-do-not-use-sysconf.patch |
254 |
+ "${FILESDIR}"/${PN}-5.1.0-do-not-use-sysconf.patch |
255 |
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
256 |
"${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch |
257 |
) |