From a3349d9b0e53ec36aaa031d1fa41195ab7a1dd27 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Thu, 5 Nov 2015 16:11:15 +0800 Subject: sys-process/criu: version bump & drop old, 1.7.2 Package-Manager: portage-2.2.23 --- sys-process/criu/Manifest | 3 +- sys-process/criu/criu-1.5.2.ebuild | 50 --------------- sys-process/criu/criu-1.7.2.ebuild | 72 ++++++++++++++++++++++ sys-process/criu/criu-1.7.ebuild | 72 ---------------------- .../criu/files/criu-1.5.1-arm64-ptrace.patch | 12 ---- 5 files changed, 73 insertions(+), 136 deletions(-) delete mode 100644 sys-process/criu/criu-1.5.2.ebuild create mode 100644 sys-process/criu/criu-1.7.2.ebuild delete mode 100644 sys-process/criu/criu-1.7.ebuild delete mode 100644 sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index 02bfa5e92c31..03a83ef96cdb 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -1,3 +1,2 @@ -DIST criu-1.5.2.tar.bz2 457573 SHA256 e8226018ac6c4094d61a1c002543e2b2253b4041a8edb24d4c1eaa41ce5ab345 SHA512 c7916fde1f63cb66a89e71867c204a251dfa2b9de703ac467bc460c6f0d895947996fd466c17cb529d2502aba7b75b8b30162baf3944fefebb71625fb88e5458 WHIRLPOOL c951692e684bd1b032bde1b534a4f4bd4b769a1e73afc56c74711ac943da907f638489205e8be2c68bbc345c1da8b641a7175dccd34aad907ca3251c3f2156a0 DIST criu-1.6.1.tar.bz2 484598 SHA256 c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512 59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8 WHIRLPOOL 07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23 -DIST criu-1.7.tar.bz2 507224 SHA256 977cf03d94415c2858581bb9894cfb90ac0c0b4b045e9bfa7c04c230aae01a21 SHA512 2d270ae68daa7ff96e5765220ee43b42f8cbbc7e6e2013209dbf69f6bcfba6ca89a632f70734e30fbc9d2985566913d0cae7b28ef6fb4f8aacb3badef2f8e69c WHIRLPOOL 66324e4161bbe879c5cf1e7e94868bfa65007556aa5c24b8d1dcb09b6ac4731190cf178b70ef66e090e774492f3c8e465277a744b0a61a2ef6c1f30217ea76b3 +DIST criu-1.7.2.tar.bz2 508012 SHA256 f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce8b9c6e85a8b7cd8479b21d SHA512 3e35d90b8cd66b96df193b37907825fbf785eea332146c767b267cbda5b6e1ae6a0d5570945990e4288f6406d8507f6c33a792c5db232cbaf396342a65b53de3 WHIRLPOOL 164cbc9d6a4969e6116644bded88b9aec8a9bc0fb737e69eaacd641376db7d274598ff3647a912ab19155d4097de8a1eaa5ea82642b4f3ba93c01b4a6725493d diff --git a/sys-process/criu/criu-1.5.2.ebuild b/sys-process/criu/criu-1.5.2.ebuild deleted file mode 100644 index 55dad0c137d5..000000000000 --- a/sys-process/criu/criu-1.5.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs linux-info flag-o-matic - -DESCRIPTION="utility to checkpoint/restore a process tree" -HOMEPAGE="http://criu.org/" -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE="setproctitle" - -RDEPEND="dev-libs/protobuf-c - setproctitle? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto" - -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG" - -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch - epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch - epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch -} - -src_compile() { - unset ARCH - emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 SETPROCTITLE=$(usex setproctitle) WERROR=0 all docs -} - -src_test() { - # root privileges are required to dump all necessary info - if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test - fi -} - -src_install() { - emake SYSCONFDIR="${EPREFIX}"/etc PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install - dodoc CREDITS README -} diff --git a/sys-process/criu/criu-1.7.2.ebuild b/sys-process/criu/criu-1.7.2.ebuild new file mode 100644 index 000000000000..23070e8cd15a --- /dev/null +++ b/sys-process/criu/criu-1.7.2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils toolchain-funcs linux-info flag-o-matic + +DESCRIPTION="utility to checkpoint/restore a process tree" +HOMEPAGE="http://criu.org/" +SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" +IUSE="setproctitle" + +RDEPEND="dev-libs/protobuf-c + setproctitle? ( dev-libs/libbsd )" +DEPEND="${RDEPEND} + app-text/asciidoc + app-text/xmlto" + +CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER + ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG" + +RESTRICT="test" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch + epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch + epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch +} + +criu_arch() { + # criu infers the arch from $(uname -m). We never want this to happen. + case ${ARCH} in + amd64) echo "x86_64";; + arm64) echo "aarch64";; + x86) echo "i386";; + *) echo "${ARCH}";; + esac +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 \ + SETPROCTITLE=$(usex setproctitle) \ + all docs +} + +src_test() { + # root privileges are required to dump all necessary info + if [[ ${EUID} -eq 0 ]] ; then + emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test + fi +} + +src_install() { + emake \ + ARCH="$(criu_arch)" \ + PREFIX="${EPREFIX}"/usr \ + LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ + DESTDIR="${D}" \ + install + + dodoc CREDITS README.md +} diff --git a/sys-process/criu/criu-1.7.ebuild b/sys-process/criu/criu-1.7.ebuild deleted file mode 100644 index 23070e8cd15a..000000000000 --- a/sys-process/criu/criu-1.7.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs linux-info flag-o-matic - -DESCRIPTION="utility to checkpoint/restore a process tree" -HOMEPAGE="http://criu.org/" -SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE="setproctitle" - -RDEPEND="dev-libs/protobuf-c - setproctitle? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto" - -CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER - ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG" - -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch - epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch - epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch -} - -criu_arch() { - # criu infers the arch from $(uname -m). We never want this to happen. - case ${ARCH} in - amd64) echo "x86_64";; - arm64) echo "aarch64";; - x86) echo "i386";; - *) echo "${ARCH}";; - esac -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - OBJCOPY="$(tc-getOBJCOPY)" \ - ARCH="$(criu_arch)" \ - V=1 WERROR=0 \ - SETPROCTITLE=$(usex setproctitle) \ - all docs -} - -src_test() { - # root privileges are required to dump all necessary info - if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test - fi -} - -src_install() { - emake \ - ARCH="$(criu_arch)" \ - PREFIX="${EPREFIX}"/usr \ - LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ - DESTDIR="${D}" \ - install - - dodoc CREDITS README.md -} diff --git a/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch b/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch deleted file mode 100644 index 497838132a24..000000000000 --- a/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/aarch64/include/asm/types.h b/arch/aarch64/include/asm/types.h -index 8dd336e..6657279 100644 ---- a/arch/aarch64/include/asm/types.h -+++ b/arch/aarch64/include/asm/types.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - #include "protobuf/core.pb-c.h" - - #include "asm-generic/page.h" -- cgit v1.2.3-65-gdbad