1 |
commit: d3f90abc513aeec17cadea530fd786b5482b6369 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 25 08:54:01 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 25 10:19:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f90abc |
7 |
|
8 |
sys-process/criu: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-process/criu/Manifest | 3 - |
13 |
sys-process/criu/criu-3.11.ebuild | 125 --------------------- |
14 |
sys-process/criu/criu-3.12.ebuild | 125 --------------------- |
15 |
sys-process/criu/criu-3.6.ebuild | 113 ------------------- |
16 |
sys-process/criu/files/2.0/criu-2.0-sysroot.patch | 9 -- |
17 |
sys-process/criu/files/2.3/criu-2.3-aarch64.patch | 22 ---- |
18 |
sys-process/criu/files/2.4/criu-2.4-makefile.patch | 78 ------------- |
19 |
.../criu/files/2.5/criu-2.5-automagic-libbsd.patch | 17 --- |
20 |
.../criu/files/criu-2.8-automagic-libbsd.patch | 17 --- |
21 |
sys-process/criu/files/criu-3.12-gcc-10.patch | 76 ------------- |
22 |
10 files changed, 585 deletions(-) |
23 |
|
24 |
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest |
25 |
index 7ebc2ced395..dc1a71857ab 100644 |
26 |
--- a/sys-process/criu/Manifest |
27 |
+++ b/sys-process/criu/Manifest |
28 |
@@ -1,4 +1 @@ |
29 |
-DIST criu-3.11.tar.bz2 809858 BLAKE2B 873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e SHA512 d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a |
30 |
-DIST criu-3.12.tar.bz2 820168 BLAKE2B ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca SHA512 bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0 |
31 |
DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6 |
32 |
-DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586 |
33 |
|
34 |
diff --git a/sys-process/criu/criu-3.11.ebuild b/sys-process/criu/criu-3.11.ebuild |
35 |
deleted file mode 100644 |
36 |
index 97a9868b722..00000000000 |
37 |
--- a/sys-process/criu/criu-3.11.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,125 +0,0 @@ |
40 |
-# Copyright 1999-2019 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=6 |
44 |
- |
45 |
-PYTHON_COMPAT=( python2_7 ) |
46 |
- |
47 |
-inherit toolchain-funcs linux-info flag-o-matic python-r1 |
48 |
- |
49 |
-DESCRIPTION="utility to checkpoint/restore a process tree" |
50 |
-HOMEPAGE="https://criu.org/" |
51 |
-SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2" |
52 |
- |
53 |
-LICENSE="GPL-2" |
54 |
-SLOT="0" |
55 |
-KEYWORDS="~amd64 ~arm ~arm64" |
56 |
-IUSE="doc python selinux setproctitle static-libs" |
57 |
- |
58 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
59 |
- |
60 |
-RDEPEND=" |
61 |
- dev-libs/protobuf-c |
62 |
- dev-libs/libnl:3 |
63 |
- net-libs/libnet:1.1 |
64 |
- sys-libs/libcap |
65 |
- python? ( ${PYTHON_DEPS} ) |
66 |
- selinux? ( sys-libs/libselinux ) |
67 |
- setproctitle? ( dev-libs/libbsd )" |
68 |
-DEPEND="${RDEPEND} |
69 |
- doc? ( |
70 |
- app-text/asciidoc |
71 |
- app-text/xmlto |
72 |
- )" |
73 |
-RDEPEND="${RDEPEND} |
74 |
- python? ( |
75 |
- dev-python/protobuf-python[${PYTHON_USEDEP}] |
76 |
- dev-python/ipaddr[${PYTHON_USEDEP}] |
77 |
- )" |
78 |
- |
79 |
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER |
80 |
- ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN |
81 |
- ~NETFILTER_XT_MARK" |
82 |
- |
83 |
-RESTRICT="test" |
84 |
- |
85 |
-PATCHES=( |
86 |
- "${FILESDIR}"/2.2/${PN}-2.2-flags.patch |
87 |
- "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch |
88 |
- "${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch |
89 |
- "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch |
90 |
-) |
91 |
- |
92 |
-criu_arch() { |
93 |
- # criu infers the arch from $(uname -m). We never want this to happen. |
94 |
- case ${ARCH} in |
95 |
- amd64) echo "x86";; |
96 |
- arm64) echo "aarch64";; |
97 |
- *) echo "${ARCH}";; |
98 |
- esac |
99 |
-} |
100 |
- |
101 |
-src_prepare() { |
102 |
- default |
103 |
- |
104 |
- if ! use selinux; then |
105 |
- sed \ |
106 |
- -e 's:libselinux:no_libselinux:g' \ |
107 |
- -i Makefile.config || die |
108 |
- fi |
109 |
- |
110 |
- use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install |
111 |
-} |
112 |
- |
113 |
-src_configure() { |
114 |
- # Gold linker generates invalid object file when used with criu's custom |
115 |
- # linker script. Use the bfd linker instead. See https://crbug.com/839665#c3 |
116 |
- tc-ld-disable-gold |
117 |
-} |
118 |
- |
119 |
-src_compile() { |
120 |
- local target="all $(usex doc 'docs' '')" |
121 |
- RAW_LDFLAGS="$(raw-ldflags)" emake \ |
122 |
- CC="$(tc-getCC)" \ |
123 |
- LD="$(tc-getLD)" \ |
124 |
- OBJCOPY="$(tc-getOBJCOPY)" \ |
125 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
126 |
- ARCH="$(criu_arch)" \ |
127 |
- V=1 WERROR=0 DEBUG=0 \ |
128 |
- SETPROCTITLE=$(usex setproctitle) \ |
129 |
- PYCRIU=$(usex python) \ |
130 |
- ${target} |
131 |
-} |
132 |
- |
133 |
-src_test() { |
134 |
- # root privileges are required to dump all necessary info |
135 |
- if [[ ${EUID} -eq 0 ]] ; then |
136 |
- emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test |
137 |
- fi |
138 |
-} |
139 |
- |
140 |
-install_crit() { |
141 |
- "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" |
142 |
-} |
143 |
- |
144 |
-src_install() { |
145 |
- emake \ |
146 |
- ARCH="$(criu_arch)" \ |
147 |
- PREFIX="${EPREFIX}"/usr \ |
148 |
- LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ |
149 |
- DESTDIR="${D}" \ |
150 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
151 |
- V=1 WERROR=0 DEBUG=0 \ |
152 |
- install |
153 |
- |
154 |
- use doc && dodoc CREDITS README.md |
155 |
- |
156 |
- if use python ; then |
157 |
- cd lib |
158 |
- python_foreach_impl install_crit |
159 |
- fi |
160 |
- |
161 |
- if ! use static-libs; then |
162 |
- find "${D}" -name "*.a" -delete || die |
163 |
- fi |
164 |
-} |
165 |
|
166 |
diff --git a/sys-process/criu/criu-3.12.ebuild b/sys-process/criu/criu-3.12.ebuild |
167 |
deleted file mode 100644 |
168 |
index 7b5158f5f9b..00000000000 |
169 |
--- a/sys-process/criu/criu-3.12.ebuild |
170 |
+++ /dev/null |
171 |
@@ -1,125 +0,0 @@ |
172 |
-# Copyright 1999-2020 Gentoo Authors |
173 |
-# Distributed under the terms of the GNU General Public License v2 |
174 |
- |
175 |
-EAPI=6 |
176 |
- |
177 |
-PYTHON_COMPAT=( python2_7 ) |
178 |
- |
179 |
-inherit toolchain-funcs linux-info flag-o-matic python-r1 |
180 |
- |
181 |
-DESCRIPTION="utility to checkpoint/restore a process tree" |
182 |
-HOMEPAGE="https://criu.org/" |
183 |
-SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2" |
184 |
- |
185 |
-LICENSE="GPL-2" |
186 |
-SLOT="0" |
187 |
-KEYWORDS="~amd64 ~arm ~arm64" |
188 |
-IUSE="doc python selinux setproctitle static-libs" |
189 |
- |
190 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
191 |
- |
192 |
-RDEPEND=" |
193 |
- dev-libs/protobuf-c |
194 |
- dev-libs/libnl:3 |
195 |
- net-libs/libnet:1.1 |
196 |
- sys-libs/libcap |
197 |
- python? ( ${PYTHON_DEPS} ) |
198 |
- selinux? ( sys-libs/libselinux ) |
199 |
- setproctitle? ( dev-libs/libbsd )" |
200 |
-DEPEND="${RDEPEND} |
201 |
- doc? ( |
202 |
- app-text/asciidoc |
203 |
- app-text/xmlto |
204 |
- )" |
205 |
-RDEPEND="${RDEPEND} |
206 |
- python? ( |
207 |
- dev-python/protobuf-python[${PYTHON_USEDEP}] |
208 |
- dev-python/ipaddr[${PYTHON_USEDEP}] |
209 |
- )" |
210 |
- |
211 |
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER |
212 |
- ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN |
213 |
- ~NETFILTER_XT_MARK" |
214 |
- |
215 |
-RESTRICT="test" |
216 |
- |
217 |
-PATCHES=( |
218 |
- "${FILESDIR}"/2.2/${PN}-2.2-flags.patch |
219 |
- "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch |
220 |
- "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch |
221 |
- "${FILESDIR}"/${PN}-3.12-gcc-10.patch # backport |
222 |
-) |
223 |
- |
224 |
-criu_arch() { |
225 |
- # criu infers the arch from $(uname -m). We never want this to happen. |
226 |
- case ${ARCH} in |
227 |
- amd64) echo "x86";; |
228 |
- arm64) echo "aarch64";; |
229 |
- *) echo "${ARCH}";; |
230 |
- esac |
231 |
-} |
232 |
- |
233 |
-src_prepare() { |
234 |
- default |
235 |
- |
236 |
- if ! use selinux; then |
237 |
- sed \ |
238 |
- -e 's:libselinux:no_libselinux:g' \ |
239 |
- -i Makefile.config || die |
240 |
- fi |
241 |
- |
242 |
- use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install |
243 |
-} |
244 |
- |
245 |
-src_configure() { |
246 |
- # Gold linker generates invalid object file when used with criu's custom |
247 |
- # linker script. Use the bfd linker instead. See https://crbug.com/839665#c3 |
248 |
- tc-ld-disable-gold |
249 |
-} |
250 |
- |
251 |
-src_compile() { |
252 |
- local target="all $(usex doc 'docs' '')" |
253 |
- RAW_LDFLAGS="$(raw-ldflags)" emake \ |
254 |
- CC="$(tc-getCC)" \ |
255 |
- LD="$(tc-getLD)" \ |
256 |
- OBJCOPY="$(tc-getOBJCOPY)" \ |
257 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
258 |
- ARCH="$(criu_arch)" \ |
259 |
- V=1 WERROR=0 DEBUG=0 \ |
260 |
- SETPROCTITLE=$(usex setproctitle) \ |
261 |
- PYCRIU=$(usex python) \ |
262 |
- ${target} |
263 |
-} |
264 |
- |
265 |
-src_test() { |
266 |
- # root privileges are required to dump all necessary info |
267 |
- if [[ ${EUID} -eq 0 ]] ; then |
268 |
- emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test |
269 |
- fi |
270 |
-} |
271 |
- |
272 |
-install_crit() { |
273 |
- "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" |
274 |
-} |
275 |
- |
276 |
-src_install() { |
277 |
- emake \ |
278 |
- ARCH="$(criu_arch)" \ |
279 |
- PREFIX="${EPREFIX}"/usr \ |
280 |
- LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ |
281 |
- DESTDIR="${D}" \ |
282 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
283 |
- V=1 WERROR=0 DEBUG=0 \ |
284 |
- install |
285 |
- |
286 |
- use doc && dodoc CREDITS README.md |
287 |
- |
288 |
- if use python ; then |
289 |
- cd lib |
290 |
- python_foreach_impl install_crit |
291 |
- fi |
292 |
- |
293 |
- if ! use static-libs; then |
294 |
- find "${D}" -name "*.a" -delete || die |
295 |
- fi |
296 |
-} |
297 |
|
298 |
diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild |
299 |
deleted file mode 100644 |
300 |
index 055d999d50a..00000000000 |
301 |
--- a/sys-process/criu/criu-3.6.ebuild |
302 |
+++ /dev/null |
303 |
@@ -1,113 +0,0 @@ |
304 |
-# Copyright 1999-2019 Gentoo Authors |
305 |
-# Distributed under the terms of the GNU General Public License v2 |
306 |
- |
307 |
-EAPI=6 |
308 |
- |
309 |
-PYTHON_COMPAT=( python2_7 ) |
310 |
- |
311 |
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 |
312 |
- |
313 |
-DESCRIPTION="utility to checkpoint/restore a process tree" |
314 |
-HOMEPAGE="http://criu.org/" |
315 |
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" |
316 |
- |
317 |
-LICENSE="GPL-2" |
318 |
-SLOT="0" |
319 |
-KEYWORDS="amd64 ~arm ~arm64" |
320 |
-IUSE="python selinux setproctitle static-libs" |
321 |
- |
322 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
323 |
- |
324 |
-RDEPEND=" |
325 |
- dev-libs/protobuf-c |
326 |
- dev-libs/libnl:3 |
327 |
- net-libs/libnet:1.1 |
328 |
- sys-libs/libcap |
329 |
- python? ( ${PYTHON_DEPS} ) |
330 |
- selinux? ( sys-libs/libselinux ) |
331 |
- setproctitle? ( dev-libs/libbsd )" |
332 |
-DEPEND="${RDEPEND} |
333 |
- app-text/asciidoc |
334 |
- app-text/xmlto" |
335 |
-RDEPEND="${RDEPEND} |
336 |
- python? ( |
337 |
- dev-python/protobuf-python[${PYTHON_USEDEP}] |
338 |
- dev-python/ipaddr[${PYTHON_USEDEP}] |
339 |
- )" |
340 |
- |
341 |
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER |
342 |
- ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG" |
343 |
- |
344 |
-RESTRICT="test" |
345 |
- |
346 |
-PATCHES=( |
347 |
- "${FILESDIR}"/2.2/${PN}-2.2-flags.patch |
348 |
- "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch |
349 |
- "${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch |
350 |
- "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch |
351 |
-) |
352 |
- |
353 |
-criu_arch() { |
354 |
- # criu infers the arch from $(uname -m). We never want this to happen. |
355 |
- case ${ARCH} in |
356 |
- amd64) echo "x86";; |
357 |
- arm64) echo "aarch64";; |
358 |
- *) echo "${ARCH}";; |
359 |
- esac |
360 |
-} |
361 |
- |
362 |
-src_prepare() { |
363 |
- default |
364 |
- |
365 |
- if ! use selinux; then |
366 |
- sed \ |
367 |
- -e 's:libselinux:no_libselinux:g' \ |
368 |
- -i Makefile.config || die |
369 |
- fi |
370 |
-} |
371 |
- |
372 |
-src_compile() { |
373 |
- RAW_LDFLAGS="$(raw-ldflags)" emake \ |
374 |
- CC="$(tc-getCC)" \ |
375 |
- LD="$(tc-getLD)" \ |
376 |
- OBJCOPY="$(tc-getOBJCOPY)" \ |
377 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
378 |
- ARCH="$(criu_arch)" \ |
379 |
- V=1 WERROR=0 DEBUG=0 \ |
380 |
- SETPROCTITLE=$(usex setproctitle) \ |
381 |
- PYCRIU=$(usex python) \ |
382 |
- all docs |
383 |
-} |
384 |
- |
385 |
-src_test() { |
386 |
- # root privileges are required to dump all necessary info |
387 |
- if [[ ${EUID} -eq 0 ]] ; then |
388 |
- emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test |
389 |
- fi |
390 |
-} |
391 |
- |
392 |
-install_crit() { |
393 |
- "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" |
394 |
-} |
395 |
- |
396 |
-src_install() { |
397 |
- emake \ |
398 |
- ARCH="$(criu_arch)" \ |
399 |
- PREFIX="${EPREFIX}"/usr \ |
400 |
- LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ |
401 |
- DESTDIR="${D}" \ |
402 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
403 |
- WERROR=0 \ |
404 |
- install |
405 |
- |
406 |
- dodoc CREDITS README.md |
407 |
- |
408 |
- if use python ; then |
409 |
- cd lib |
410 |
- python_foreach_impl install_crit |
411 |
- fi |
412 |
- |
413 |
- if ! use static-libs; then |
414 |
- find "${D}" -name "*.a" -delete || die |
415 |
- fi |
416 |
-} |
417 |
|
418 |
diff --git a/sys-process/criu/files/2.0/criu-2.0-sysroot.patch b/sys-process/criu/files/2.0/criu-2.0-sysroot.patch |
419 |
deleted file mode 100644 |
420 |
index 4dcb0fb2c95..00000000000 |
421 |
--- a/sys-process/criu/files/2.0/criu-2.0-sysroot.patch |
422 |
+++ /dev/null |
423 |
@@ -1,9 +0,0 @@ |
424 |
-Using host headers when cross compiling is not a great idea. |
425 |
- |
426 |
-Index: criu-2.0/criu/Makefile |
427 |
-=================================================================== |
428 |
---- criu-2.0.orig/criu/Makefile |
429 |
-+++ criu-2.0/criu/Makefile |
430 |
-@@ -51,1 +51,1 @@ ccflags-y += -iquote $(SRC_DIR)/criu/pi |
431 |
--ccflags-y += -I/usr/include/libnl3 |
432 |
-+ccflags-y += -I${SYSROOT}/usr/include/libnl3 |
433 |
|
434 |
diff --git a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch b/sys-process/criu/files/2.3/criu-2.3-aarch64.patch |
435 |
deleted file mode 100644 |
436 |
index e857b6a1aa2..00000000000 |
437 |
--- a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch |
438 |
+++ /dev/null |
439 |
@@ -1,22 +0,0 @@ |
440 |
-diff --git a/Makefile b/Makefile |
441 |
-index 0e2636b..ef8f78b 100644 |
442 |
---- a/Makefile |
443 |
-+++ b/Makefile |
444 |
-@@ -25,7 +25,7 @@ export SRC_DIR |
445 |
- |
446 |
- # |
447 |
- # Architecture specific options. |
448 |
--ifneq ($(filter-out x86 arm arm64 ppc64,$(ARCH)),) |
449 |
-+ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),) |
450 |
- $(error "The architecture $(ARCH) isn't supported") |
451 |
- endif |
452 |
- |
453 |
-@@ -39,7 +39,7 @@ ifeq ($(ARCH),arm) |
454 |
- SRCARCH := arm |
455 |
- endif |
456 |
- |
457 |
--ifeq ($(ARCH),arm64) |
458 |
-+ifeq ($(ARCH),aarch64) |
459 |
- ARCH := aarch64 |
460 |
- SRCARCH := aarch64 |
461 |
- VDSO := y |
462 |
|
463 |
diff --git a/sys-process/criu/files/2.4/criu-2.4-makefile.patch b/sys-process/criu/files/2.4/criu-2.4-makefile.patch |
464 |
deleted file mode 100644 |
465 |
index 8a0fb6d940f..00000000000 |
466 |
--- a/sys-process/criu/files/2.4/criu-2.4-makefile.patch |
467 |
+++ /dev/null |
468 |
@@ -1,78 +0,0 @@ |
469 |
-diff --git a/Makefile.install b/Makefile.install |
470 |
-index e3dd551..495ad39 100644 |
471 |
---- a/Makefile.install |
472 |
-+++ b/Makefile.install |
473 |
-@@ -6,24 +6,11 @@ BINDIR ?= $(PREFIX)/bin |
474 |
- SBINDIR ?= $(PREFIX)/sbin |
475 |
- MANDIR ?= $(PREFIX)/share/man |
476 |
- SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/ |
477 |
--LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/ |
478 |
-+LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/ |
479 |
- LIBDIR ?= $(PREFIX)/lib |
480 |
- INCLUDEDIR ?= $(PREFIX)/include/criu |
481 |
- LIBEXECDIR ?= $(PREFIX)/libexec |
482 |
- |
483 |
--# |
484 |
--# For recent Debian/Ubuntu with multiarch support. |
485 |
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) |
486 |
--ifneq "$(DEB_HOST_MULTIARCH)" "" |
487 |
-- LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) |
488 |
--else |
489 |
-- # |
490 |
-- # For most other systems |
491 |
-- ifeq "$(shell uname -m)" "x86_64" |
492 |
-- LIBDIR ?= $(PREFIX)/lib64 |
493 |
-- endif |
494 |
--endif |
495 |
-- |
496 |
- export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR |
497 |
- export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR |
498 |
- |
499 |
-diff --git a/lib/Makefile b/lib/Makefile |
500 |
-index f1c0821..3bef265 100644 |
501 |
---- a/lib/Makefile |
502 |
-+++ b/lib/Makefile |
503 |
-@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO) |
504 |
- # |
505 |
- # Python bindings. |
506 |
- lib-py: |
507 |
-+ifeq ($(PYCRIU),yes) |
508 |
- $(call msg-gen, $@) |
509 |
- $(Q) $(MAKE) -C py all |
510 |
-+else |
511 |
-+ $(Q) echo "no py criu" |
512 |
-+endif |
513 |
- .PHONY: lib-py |
514 |
- |
515 |
- all: lib-c lib-py |
516 |
-@@ -43,7 +47,7 @@ clean: |
517 |
- $(Q) $(RM) -r build usr |
518 |
- .PHONY: clean |
519 |
- |
520 |
--install: lib-c lib-py ../crit/crit c/criu.pc.in |
521 |
-+install: lib-c ../crit/crit c/criu.pc.in |
522 |
- $(E) " INSTALL " $(CRIU_SO) |
523 |
- $(Q) mkdir -p $(DESTDIR)$(LIBDIR) |
524 |
- $(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR) |
525 |
-@@ -55,8 +59,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in |
526 |
- $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig |
527 |
- $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc |
528 |
- $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig |
529 |
-- $(E) " INSTALL " crit |
530 |
-- $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) |
531 |
- .PHONY: install |
532 |
- |
533 |
- uninstall: |
534 |
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk |
535 |
-index bd40944..3cfbffa 100644 |
536 |
---- a/scripts/nmk/scripts/build.mk |
537 |
-+++ b/scripts/nmk/scripts/build.mk |
538 |
-@@ -87,7 +87,7 @@ builtin-name := $(strip $(builtin-name)) |
539 |
- |
540 |
- # |
541 |
- # Link flags. |
542 |
--ld_flags := $(strip $(LDFLAGS) $(ldflags-y)) |
543 |
-+ld_flags := $(strip $(RAW_LDFLAGS) $(ldflags-y)) |
544 |
- |
545 |
- # |
546 |
- # $(obj) related rules. |
547 |
|
548 |
diff --git a/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch b/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch |
549 |
deleted file mode 100644 |
550 |
index de6509a745c..00000000000 |
551 |
--- a/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch |
552 |
+++ /dev/null |
553 |
@@ -1,17 +0,0 @@ |
554 |
-diff --git a/criu/Makefile.config b/criu/Makefile.config |
555 |
-index f531b3b..23a3b23 100644 |
556 |
---- a/criu/Makefile.config |
557 |
-+++ b/criu/Makefile.config |
558 |
-@@ -2,10 +2,12 @@ include $(__nmk_dir)/utils.mk |
559 |
- include $(__nmk_dir)msg.mk |
560 |
- include $(SRC_DIR)/scripts/feature-tests.mak |
561 |
- |
562 |
-+ifeq ($(SETPROCTITLE),yes) |
563 |
- ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) |
564 |
- LIBS += -lbsd |
565 |
- FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD |
566 |
- endif |
567 |
-+endif |
568 |
- |
569 |
- ifeq ($(call pkg-config-check,libselinux),y) |
570 |
- LIBS += -lselinux |
571 |
|
572 |
diff --git a/sys-process/criu/files/criu-2.8-automagic-libbsd.patch b/sys-process/criu/files/criu-2.8-automagic-libbsd.patch |
573 |
deleted file mode 100644 |
574 |
index 54781ea5f84..00000000000 |
575 |
--- a/sys-process/criu/files/criu-2.8-automagic-libbsd.patch |
576 |
+++ /dev/null |
577 |
@@ -1,17 +0,0 @@ |
578 |
-diff --git a/Makefile.config b/Makefile.config |
579 |
-index e0d49d2..d1b2b9d 100644 |
580 |
---- a/Makefile.config |
581 |
-+++ b/Makefile.config |
582 |
-@@ -2,10 +2,12 @@ include $(__nmk_dir)utils.mk |
583 |
- include $(__nmk_dir)msg.mk |
584 |
- include $(SRC_DIR)/scripts/feature-tests.mak |
585 |
- |
586 |
-+ifeq ($(SETPROCTITLE),yes) |
587 |
- ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) |
588 |
- LIBS_FEATURES += -lbsd |
589 |
- FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD |
590 |
- endif |
591 |
-+endif |
592 |
- |
593 |
- ifeq ($(call pkg-config-check,libselinux),y) |
594 |
- LIBS_FEATURES += -lselinux |
595 |
|
596 |
diff --git a/sys-process/criu/files/criu-3.12-gcc-10.patch b/sys-process/criu/files/criu-3.12-gcc-10.patch |
597 |
deleted file mode 100644 |
598 |
index ff277b5b22d..00000000000 |
599 |
--- a/sys-process/criu/files/criu-3.12-gcc-10.patch |
600 |
+++ /dev/null |
601 |
@@ -1,76 +0,0 @@ |
602 |
-https://bugs.gentoo.org/707942 |
603 |
- |
604 |
-From 10d9dcdb6e2fbe4646ff3f27cd35376ebaeeb0f9 Mon Sep 17 00:00:00 2001 |
605 |
-From: Sergei Trofimovich <slyfox@g.o> |
606 |
-Date: Sun, 2 Feb 2020 18:45:59 +0000 |
607 |
-Subject: [PATCH] criu: fix build failure against gcc-10 |
608 |
-MIME-Version: 1.0 |
609 |
-Content-Type: text/plain; charset=UTF-8 |
610 |
-Content-Transfer-Encoding: 8bit |
611 |
- |
612 |
-On gcc-10 (and gcc-9 -fno-common) build fails as: |
613 |
- |
614 |
-``` |
615 |
-ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159: |
616 |
- multiple definition of `rpc_cfg_file'; criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here |
617 |
-make[2]: *** [scripts/nmk/scripts/build.mk:164: criu/arch/x86/crtools.built-in.o] Error 1 |
618 |
-``` |
619 |
- |
620 |
-gcc-10 will change the default from -fcommon to fno-common: |
621 |
-https://gcc.gnu.org/PR85678. |
622 |
- |
623 |
-The error also happens if CFLAGS=-fno-common passed explicitly. |
624 |
- |
625 |
-Reported-by: Toralf Förster |
626 |
-Bug: https://bugs.gentoo.org/707942 |
627 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
628 |
---- |
629 |
- criu/config.c | 1 + |
630 |
- criu/include/cr_options.h | 2 +- |
631 |
- criu/include/pstree.h | 2 +- |
632 |
- criu/include/tun.h | 2 +- |
633 |
- 4 files changed, 4 insertions(+), 3 deletions(-) |
634 |
- |
635 |
---- a/criu/config.c |
636 |
-+++ b/criu/config.c |
637 |
-@@ -30,6 +30,7 @@ |
638 |
- #include "common/xmalloc.h" |
639 |
- |
640 |
- struct cr_options opts; |
641 |
-+char *rpc_cfg_file; |
642 |
- |
643 |
- static int count_elements(char **to_count) |
644 |
- { |
645 |
---- a/criu/include/cr_options.h |
646 |
-+++ b/criu/include/cr_options.h |
647 |
-@@ -156,7 +156,7 @@ struct cr_options { |
648 |
- }; |
649 |
- |
650 |
- extern struct cr_options opts; |
651 |
--char *rpc_cfg_file; |
652 |
-+extern char *rpc_cfg_file; |
653 |
- |
654 |
- extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state); |
655 |
- extern int check_options(void); |
656 |
---- a/criu/include/pstree.h |
657 |
-+++ b/criu/include/pstree.h |
658 |
-@@ -42,7 +42,7 @@ enum { |
659 |
- }; |
660 |
- #define FDS_EVENT (1 << FDS_EVENT_BIT) |
661 |
- |
662 |
--struct pstree_item *current; |
663 |
-+extern struct pstree_item *current; |
664 |
- |
665 |
- struct rst_info; |
666 |
- /* See alloc_pstree_item() for details */ |
667 |
---- a/criu/include/tun.h |
668 |
-+++ b/criu/include/tun.h |
669 |
-@@ -5,7 +5,7 @@ |
670 |
- #define TUN_MINOR 200 |
671 |
- #endif |
672 |
- |
673 |
--struct ns_id *ns; |
674 |
-+extern struct ns_id *ns; |
675 |
- |
676 |
- #include <linux/netlink.h> |
677 |
- |