Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/files/2.0/, sys-process/criu/
Date: Fri, 27 May 2016 07:18:02
Message-Id: 1464333394.c25c0b89e18f461c49ac6af2d8a009ff5524e486.dlan@gentoo
1 commit: c25c0b89e18f461c49ac6af2d8a009ff5524e486
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 27 06:46:59 2016 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Fri May 27 07:16:34 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25c0b89
7
8 sys-process/criu: drop old versions
9
10 Package-Manager: portage-2.2.28
11
12 sys-process/criu/Manifest | 3 -
13 sys-process/criu/criu-1.6.1.ebuild | 72 -----------------
14 sys-process/criu/criu-1.7.2.ebuild | 72 -----------------
15 sys-process/criu/criu-2.0-r1.ebuild | 93 ----------------------
16 sys-process/criu/files/2.0/criu-2.0-makefile.patch | 77 ------------------
17 sys-process/criu/files/criu-1.3.1-makefile.patch | 20 -----
18 .../criu/files/criu-1.5-automagic-libbsd.patch | 29 -------
19 7 files changed, 366 deletions(-)
20
21 diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
22 index a0138aa..5e82180 100644
23 --- a/sys-process/criu/Manifest
24 +++ b/sys-process/criu/Manifest
25 @@ -1,6 +1,3 @@
26 -DIST criu-1.6.1.tar.bz2 484598 SHA256 c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512 59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8 WHIRLPOOL 07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23
27 -DIST criu-1.7.2.tar.bz2 508012 SHA256 f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce8b9c6e85a8b7cd8479b21d SHA512 3e35d90b8cd66b96df193b37907825fbf785eea332146c767b267cbda5b6e1ae6a0d5570945990e4288f6406d8507f6c33a792c5db232cbaf396342a65b53de3 WHIRLPOOL 164cbc9d6a4969e6116644bded88b9aec8a9bc0fb737e69eaacd641376db7d274598ff3647a912ab19155d4097de8a1eaa5ea82642b4f3ba93c01b4a6725493d
28 DIST criu-1.8.tar.bz2 534200 SHA256 d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512 de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d WHIRLPOOL 2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f
29 -DIST criu-2.0.tar.bz2 548581 SHA256 e80726cc54f74751ae6f63a5b0cf9a2882ffc3fd2aa11b311da0384635d418ff SHA512 ebe785c3da9d54ba517254f7851f0283ccf3826cba30a07c6c74a7253f2d7235f32bb921623a23e6103a3c3e4461e1bc5dc06484270c8e25929c8e981a8b036f WHIRLPOOL 7999a2aeb40f9a932a8b1d11c842f78c710718f08ca1f29b373c69d34b82ebc7ab9b6a659460a058333d6591b64ef76215cdc2d70760cbd57c4d1444d9abe622
30 DIST criu-2.1.tar.bz2 556820 SHA256 7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512 19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439 WHIRLPOOL 4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
31 DIST criu-2.2.tar.bz2 558926 SHA256 f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd WHIRLPOOL 62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
32
33 diff --git a/sys-process/criu/criu-1.6.1.ebuild b/sys-process/criu/criu-1.6.1.ebuild
34 deleted file mode 100644
35 index 3806853..0000000
36 --- a/sys-process/criu/criu-1.6.1.ebuild
37 +++ /dev/null
38 @@ -1,72 +0,0 @@
39 -# Copyright 1999-2015 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -# $Id$
42 -
43 -EAPI=5
44 -
45 -inherit eutils toolchain-funcs linux-info flag-o-matic
46 -
47 -DESCRIPTION="utility to checkpoint/restore a process tree"
48 -HOMEPAGE="http://criu.org/"
49 -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
50 -
51 -LICENSE="GPL-2"
52 -SLOT="0"
53 -KEYWORDS="~amd64 ~arm ~arm64"
54 -IUSE="setproctitle"
55 -
56 -RDEPEND="dev-libs/protobuf-c
57 - setproctitle? ( dev-libs/libbsd )"
58 -DEPEND="${RDEPEND}
59 - app-text/asciidoc
60 - app-text/xmlto"
61 -
62 -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
63 - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
64 -
65 -RESTRICT="test"
66 -
67 -src_prepare() {
68 - epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch
69 - epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch
70 - epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch
71 -}
72 -
73 -criu_arch() {
74 - # criu infers the arch from $(uname -m). We never want this to happen.
75 - case ${ARCH} in
76 - amd64) echo "x86_64";;
77 - arm64) echo "aarch64";;
78 - x86) echo "i386";;
79 - *) echo "${ARCH}";;
80 - esac
81 -}
82 -
83 -src_compile() {
84 - emake \
85 - CC="$(tc-getCC)" \
86 - LD="$(tc-getLD)" \
87 - OBJCOPY="$(tc-getOBJCOPY)" \
88 - ARCH="$(criu_arch)" \
89 - V=1 WERROR=0 \
90 - SETPROCTITLE=$(usex setproctitle) \
91 - all docs
92 -}
93 -
94 -src_test() {
95 - # root privileges are required to dump all necessary info
96 - if [[ ${EUID} -eq 0 ]] ; then
97 - emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
98 - fi
99 -}
100 -
101 -src_install() {
102 - emake \
103 - ARCH="$(criu_arch)" \
104 - PREFIX="${EPREFIX}"/usr \
105 - LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
106 - DESTDIR="${D}" \
107 - install
108 -
109 - dodoc CREDITS README.md
110 -}
111
112 diff --git a/sys-process/criu/criu-1.7.2.ebuild b/sys-process/criu/criu-1.7.2.ebuild
113 deleted file mode 100644
114 index 23070e8..0000000
115 --- a/sys-process/criu/criu-1.7.2.ebuild
116 +++ /dev/null
117 @@ -1,72 +0,0 @@
118 -# Copyright 1999-2015 Gentoo Foundation
119 -# Distributed under the terms of the GNU General Public License v2
120 -# $Id$
121 -
122 -EAPI=5
123 -
124 -inherit eutils toolchain-funcs linux-info flag-o-matic
125 -
126 -DESCRIPTION="utility to checkpoint/restore a process tree"
127 -HOMEPAGE="http://criu.org/"
128 -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
129 -
130 -LICENSE="GPL-2"
131 -SLOT="0"
132 -KEYWORDS="~amd64 ~arm ~arm64"
133 -IUSE="setproctitle"
134 -
135 -RDEPEND="dev-libs/protobuf-c
136 - setproctitle? ( dev-libs/libbsd )"
137 -DEPEND="${RDEPEND}
138 - app-text/asciidoc
139 - app-text/xmlto"
140 -
141 -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
142 - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
143 -
144 -RESTRICT="test"
145 -
146 -src_prepare() {
147 - epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch
148 - epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch
149 - epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch
150 -}
151 -
152 -criu_arch() {
153 - # criu infers the arch from $(uname -m). We never want this to happen.
154 - case ${ARCH} in
155 - amd64) echo "x86_64";;
156 - arm64) echo "aarch64";;
157 - x86) echo "i386";;
158 - *) echo "${ARCH}";;
159 - esac
160 -}
161 -
162 -src_compile() {
163 - emake \
164 - CC="$(tc-getCC)" \
165 - LD="$(tc-getLD)" \
166 - OBJCOPY="$(tc-getOBJCOPY)" \
167 - ARCH="$(criu_arch)" \
168 - V=1 WERROR=0 \
169 - SETPROCTITLE=$(usex setproctitle) \
170 - all docs
171 -}
172 -
173 -src_test() {
174 - # root privileges are required to dump all necessary info
175 - if [[ ${EUID} -eq 0 ]] ; then
176 - emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
177 - fi
178 -}
179 -
180 -src_install() {
181 - emake \
182 - ARCH="$(criu_arch)" \
183 - PREFIX="${EPREFIX}"/usr \
184 - LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
185 - DESTDIR="${D}" \
186 - install
187 -
188 - dodoc CREDITS README.md
189 -}
190
191 diff --git a/sys-process/criu/criu-2.0-r1.ebuild b/sys-process/criu/criu-2.0-r1.ebuild
192 deleted file mode 100644
193 index 51da20c..0000000
194 --- a/sys-process/criu/criu-2.0-r1.ebuild
195 +++ /dev/null
196 @@ -1,93 +0,0 @@
197 -# Copyright 1999-2016 Gentoo Foundation
198 -# Distributed under the terms of the GNU General Public License v2
199 -# $Id$
200 -
201 -EAPI=5
202 -
203 -PYTHON_COMPAT=( python2_7 )
204 -
205 -inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
206 -
207 -DESCRIPTION="utility to checkpoint/restore a process tree"
208 -HOMEPAGE="http://criu.org/"
209 -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
210 -
211 -LICENSE="GPL-2"
212 -SLOT="0"
213 -KEYWORDS="~amd64 ~arm ~arm64"
214 -IUSE="python setproctitle"
215 -
216 -RDEPEND="dev-libs/protobuf-c
217 - dev-libs/libnl:3
218 - python? ( ${PYTHON_DEPS} )
219 - setproctitle? ( dev-libs/libbsd )"
220 -DEPEND="${RDEPEND}
221 - app-text/asciidoc
222 - app-text/xmlto"
223 -RDEPEND="${RDEPEND}
224 - python? (
225 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
226 - dev-python/ipaddr[${PYTHON_USEDEP}]
227 - )"
228 -
229 -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
230 - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
231 -
232 -RESTRICT="test"
233 -
234 -src_prepare() {
235 - epatch "${FILESDIR}"/${PV}/${P}-flags.patch
236 - epatch "${FILESDIR}"/${PV}/${P}-makefile.patch
237 - epatch "${FILESDIR}"/${PV}/${P}-automagic-libbsd.patch
238 - epatch "${FILESDIR}"/${PV}/${P}-sysroot.patch
239 -}
240 -
241 -criu_arch() {
242 - # criu infers the arch from $(uname -m). We never want this to happen.
243 - case ${ARCH} in
244 - amd64) echo "x86";;
245 - arm64) echo "aarch64";;
246 - *) echo "${ARCH}";;
247 - esac
248 -}
249 -
250 -src_compile() {
251 - RAW_LDFLAGS="$(raw-ldflags)" emake \
252 - CC="$(tc-getCC)" \
253 - LD="$(tc-getLD)" \
254 - OBJCOPY="$(tc-getOBJCOPY)" \
255 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
256 - ARCH="$(criu_arch)" \
257 - V=1 WERROR=0 DEBUG=0 \
258 - SETPROCTITLE=$(usex setproctitle) \
259 - PYCRIU=$(usex python) \
260 - all docs
261 -}
262 -
263 -src_test() {
264 - # root privileges are required to dump all necessary info
265 - if [[ ${EUID} -eq 0 ]] ; then
266 - emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
267 - fi
268 -}
269 -
270 -install_crit() {
271 - "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
272 -}
273 -
274 -src_install() {
275 - emake \
276 - ARCH="$(criu_arch)" \
277 - PREFIX="${EPREFIX}"/usr \
278 - LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
279 - DESTDIR="${D}" \
280 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
281 - install
282 -
283 - dodoc CREDITS README.md
284 -
285 - if use python ; then
286 - cd lib
287 - python_foreach_impl install_crit
288 - fi
289 -}
290
291 diff --git a/sys-process/criu/files/2.0/criu-2.0-makefile.patch b/sys-process/criu/files/2.0/criu-2.0-makefile.patch
292 deleted file mode 100644
293 index a2783c7..0000000
294 --- a/sys-process/criu/files/2.0/criu-2.0-makefile.patch
295 +++ /dev/null
296 @@ -1,77 +0,0 @@
297 -diff --git a/Makefile.install b/Makefile.install
298 -index 6fcf25e..103373b 100644
299 ---- a/Makefile.install
300 -+++ b/Makefile.install
301 -@@ -5,23 +5,10 @@ PREFIX ?= /usr/local
302 - SBINDIR ?= $(PREFIX)/sbin
303 - MANDIR ?= $(PREFIX)/share/man
304 - SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/
305 --LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/
306 -+LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/
307 - LIBDIR ?= $(PREFIX)/lib
308 - INCLUDEDIR ?= $(PREFIX)/include/criu
309 -
310 --#
311 --# For recent Debian/Ubuntu with multiarch support.
312 --DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
313 --ifneq "$(DEB_HOST_MULTIARCH)" ""
314 -- LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
315 --else
316 -- #
317 -- # For most other systems
318 -- ifeq "$(shell uname -m)" "x86_64"
319 -- LIBDIR ?= $(PREFIX)/lib64
320 -- endif
321 --endif
322 --
323 - export SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
324 - export INCLUDEDIR LIBDIR DESTDIR PREFIX
325 -
326 -diff --git a/lib/Makefile b/lib/Makefile
327 -index 0cd59a1..63bdaba 100644
328 ---- a/lib/Makefile
329 -+++ b/lib/Makefile
330 -@@ -20,10 +20,12 @@ PHONY += lib-c
331 -
332 - #
333 - # Python bindings.
334 -+ifeq ($(PYCRIU),yes)
335 - lib-py:
336 - $(call msg-gen, $@)
337 - $(Q) $(MAKE) -C py all
338 - PHONY += lib-py
339 -+endif
340 -
341 - clean:
342 - $(call msg-clean, lib-c)
343 -@@ -37,7 +39,7 @@ all: $(PHONY)
344 - @true
345 - PHONY += all
346 -
347 --install: lib-c lib-py ../crit/crit c/criu.pc.in
348 -+install: lib-c ../crit/crit c/criu.pc.in
349 - $(E) " INSTALL " $(CRIU_SO)
350 - $(Q) mkdir -p $(DESTDIR)$(LIBDIR)
351 - $(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
352 -@@ -49,8 +51,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
353 - $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
354 - $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
355 - $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
356 -- $(E) " INSTALL " crit
357 -- $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
358 - .PHONY: install
359 -
360 - .PHONY: $(PHONY) clean
361 -diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
362 -index 10a5d44..ffe2a3c 100644
363 ---- a/scripts/nmk/scripts/build.mk
364 -+++ b/scripts/nmk/scripts/build.mk
365 -@@ -43,7 +43,7 @@ builtin-name := $(strip $(builtin-name))
366 -
367 - #
368 - # Link flags.
369 --ld_flags := $(strip $(LDFLAGS) $(ldflags-y))
370 -+ld_flags := $(strip $(RAW_LDFLAGS) $(ldflags-y))
371 -
372 - #
373 - # Prepare targets.
374
375 diff --git a/sys-process/criu/files/criu-1.3.1-makefile.patch b/sys-process/criu/files/criu-1.3.1-makefile.patch
376 deleted file mode 100644
377 index 50781c1..0000000
378 --- a/sys-process/criu/files/criu-1.3.1-makefile.patch
379 +++ /dev/null
380 @@ -1,20 +0,0 @@
381 ---- criu-1.3.1/Makefile.inc
382 -+++ criu-1.3.1/Makefile.inc
383 -@@ -15,15 +15,9 @@
384 - SBINDIR := $(PREFIX)/sbin
385 - MANDIR := $(PREFIX)/share/man
386 - SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system/
387 --LOGROTATEDIR := $(PREFIX)/etc/logrotate.d/
388 -+LOGROTATEDIR := $(SYSCONFDIR)/etc/logrotate.d/
389 - LIBDIR := $(PREFIX)/lib
390 --# For recent Debian/Ubuntu with multiarch support
391 --DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \
392 -- -qDEB_HOST_MULTIARCH 2>/dev/null)
393 --ifneq "$(DEB_HOST_MULTIARCH)" ""
394 --LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
395 --# For most other systems
396 --else ifeq "$(shell uname -m)" "x86_64"
397 -+ifeq "$(shell uname -m)" "x86_64"
398 - LIBDIR := $(PREFIX)/lib64
399 - endif
400 -
401
402 diff --git a/sys-process/criu/files/criu-1.5-automagic-libbsd.patch b/sys-process/criu/files/criu-1.5-automagic-libbsd.patch
403 deleted file mode 100644
404 index 8f5e4b4..0000000
405 --- a/sys-process/criu/files/criu-1.5-automagic-libbsd.patch
406 +++ /dev/null
407 @@ -1,29 +0,0 @@
408 -Control libbsd dependency via SETPROCTITLE definition.
409 -
410 ---- criu-1.5/Makefile.config
411 -+++ criu-1.5/Makefile.config
412 -@@ -3,10 +3,12 @@
413 -
414 - CONFIG := include/config.h
415 -
416 -+ifeq ($(SETPROCTITLE),yes)
417 - ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y)
418 - LIBS += -lbsd
419 - DEFINES += -DCONFIG_HAS_LIBBSD
420 - endif
421 -+endif
422 -
423 - $(CONFIG): scripts/utilities.mak scripts/feature-tests.mak include/config-base.h
424 - $(E) " GEN " $@
425 -@@ -33,9 +35,11 @@
426 - ifeq ($(VDSO),y)
427 - $(Q) @echo '#define CONFIG_VDSO' >> $@
428 - endif
429 -+ifeq ($(SETPROCTITLE),yes)
430 - ifeq ($(call try-cc,$(SETPROCTITLE_INIT_TEST),-lbsd),y)
431 - $(Q) @echo '#define CONFIG_HAS_SETPROCTITLE_INIT' >> $@
432 - endif
433 -+endif
434 - $(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $@
435 -
436 - config: $(CONFIG)
Report Message
Find on MARC Find on Google Groups