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/
Date: Tue, 08 Dec 2015 11:39:39
Message-Id: 1449574706.99e2622db706cdda6a4e23b18bc5fb0d2a665fef.dlan@gentoo
1 commit: 99e2622db706cdda6a4e23b18bc5fb0d2a665fef
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 8 11:38:26 2015 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 8 11:38:26 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e2622d
7
8 sys-process/criu: version bump to 1.8
9
10 Package-Manager: portage-2.2.24
11
12 sys-process/criu/Manifest | 1 +
13 sys-process/criu/criu-1.8.ebuild | 72 ++++++++++++++++++++++++++
14 sys-process/criu/files/criu-1.8-makefile.patch | 25 +++++++++
15 3 files changed, 98 insertions(+)
16
17 diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
18 index 03a83ef..6e51d1a 100644
19 --- a/sys-process/criu/Manifest
20 +++ b/sys-process/criu/Manifest
21 @@ -1,2 +1,3 @@
22 DIST criu-1.6.1.tar.bz2 484598 SHA256 c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512 59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8 WHIRLPOOL 07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23
23 DIST criu-1.7.2.tar.bz2 508012 SHA256 f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce8b9c6e85a8b7cd8479b21d SHA512 3e35d90b8cd66b96df193b37907825fbf785eea332146c767b267cbda5b6e1ae6a0d5570945990e4288f6406d8507f6c33a792c5db232cbaf396342a65b53de3 WHIRLPOOL 164cbc9d6a4969e6116644bded88b9aec8a9bc0fb737e69eaacd641376db7d274598ff3647a912ab19155d4097de8a1eaa5ea82642b4f3ba93c01b4a6725493d
24 +DIST criu-1.8.tar.bz2 534200 SHA256 d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512 de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d WHIRLPOOL 2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f
25
26 diff --git a/sys-process/criu/criu-1.8.ebuild b/sys-process/criu/criu-1.8.ebuild
27 new file mode 100644
28 index 0000000..120c6da
29 --- /dev/null
30 +++ b/sys-process/criu/criu-1.8.ebuild
31 @@ -0,0 +1,72 @@
32 +# Copyright 1999-2015 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI=5
37 +
38 +inherit eutils toolchain-funcs linux-info flag-o-matic
39 +
40 +DESCRIPTION="utility to checkpoint/restore a process tree"
41 +HOMEPAGE="http://criu.org/"
42 +SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
43 +
44 +LICENSE="GPL-2"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~arm ~arm64"
47 +IUSE="setproctitle"
48 +
49 +RDEPEND="dev-libs/protobuf-c
50 + setproctitle? ( dev-libs/libbsd )"
51 +DEPEND="${RDEPEND}
52 + app-text/asciidoc
53 + app-text/xmlto"
54 +
55 +CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
56 + ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
57 +
58 +RESTRICT="test"
59 +
60 +src_prepare() {
61 + epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch
62 + epatch "${FILESDIR}"/${PN}-1.8-makefile.patch
63 + epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch
64 +}
65 +
66 +criu_arch() {
67 + # criu infers the arch from $(uname -m). We never want this to happen.
68 + case ${ARCH} in
69 + amd64) echo "x86_64";;
70 + arm64) echo "aarch64";;
71 + x86) echo "i386";;
72 + *) echo "${ARCH}";;
73 + esac
74 +}
75 +
76 +src_compile() {
77 + emake \
78 + CC="$(tc-getCC)" \
79 + LD="$(tc-getLD)" \
80 + OBJCOPY="$(tc-getOBJCOPY)" \
81 + ARCH="$(criu_arch)" \
82 + V=1 WERROR=0 \
83 + SETPROCTITLE=$(usex setproctitle) \
84 + all docs
85 +}
86 +
87 +src_test() {
88 + # root privileges are required to dump all necessary info
89 + if [[ ${EUID} -eq 0 ]] ; then
90 + emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
91 + fi
92 +}
93 +
94 +src_install() {
95 + emake \
96 + ARCH="$(criu_arch)" \
97 + PREFIX="${EPREFIX}"/usr \
98 + LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
99 + DESTDIR="${D}" \
100 + install
101 +
102 + dodoc CREDITS README.md
103 +}
104
105 diff --git a/sys-process/criu/files/criu-1.8-makefile.patch b/sys-process/criu/files/criu-1.8-makefile.patch
106 new file mode 100644
107 index 0000000..2c1921f
108 --- /dev/null
109 +++ b/sys-process/criu/files/criu-1.8-makefile.patch
110 @@ -0,0 +1,25 @@
111 +diff --git a/Makefile.inc b/Makefile.inc
112 +index 5f0a552..4abc9ab 100644
113 +--- a/Makefile.inc
114 ++++ b/Makefile.inc
115 +@@ -15,16 +15,11 @@ PREFIX ?= /usr/local
116 + SBINDIR ?= $(PREFIX)/sbin
117 + MANDIR ?= $(PREFIX)/share/man
118 + SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/
119 +-LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/
120 +-LIBDIR ?= $(PREFIX)/lib
121 +-# For recent Debian/Ubuntu with multiarch support
122 +-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \
123 +- -qDEB_HOST_MULTIARCH 2>/dev/null)
124 +-ifneq "$(DEB_HOST_MULTIARCH)" ""
125 +-LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
126 +-# For most other systems
127 +-else ifeq "$(shell uname -m)" "x86_64"
128 ++LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/
129 ++ifeq "$(shell uname -m)" "x86_64"
130 + LIBDIR ?= $(PREFIX)/lib64
131 ++else
132 ++LIBDIR ?= $(PREFIX)/lib
133 + endif
134 +
135 + INCLUDEDIR ?= $(PREFIX)/include/criu