commit: 2a92970a3998e8bf09883c771690b4eab0b71c2b Author: Yixun Lan <dlan <AT> gentoo <DOT> org> AuthorDate: Tue Mar 15 03:11:51 2016 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Mar 15 03:20:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a92970a
sys-process/criu: version bump 2.0 Package-Manager: portage-2.2.27 sys-process/criu/Manifest | 1 + sys-process/criu/criu-2.0.ebuild | 71 ++++++++++++++++++++++ .../criu/files/2.0/criu-2.0-automagic-libbsd.patch | 17 ++++++ sys-process/criu/files/2.0/criu-2.0-flags.patch | 13 ++++ sys-process/criu/files/2.0/criu-2.0-makefile.patch | 34 +++++++++++ 5 files changed, 136 insertions(+) diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index 6e51d1a..77aa45f 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -1,3 +1,4 @@ DIST criu-1.6.1.tar.bz2 484598 SHA256 c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512 59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8 WHIRLPOOL 07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23 DIST criu-1.7.2.tar.bz2 508012 SHA256 f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce8b9c6e85a8b7cd8479b21d SHA512 3e35d90b8cd66b96df193b37907825fbf785eea332146c767b267cbda5b6e1ae6a0d5570945990e4288f6406d8507f6c33a792c5db232cbaf396342a65b53de3 WHIRLPOOL 164cbc9d6a4969e6116644bded88b9aec8a9bc0fb737e69eaacd641376db7d274598ff3647a912ab19155d4097de8a1eaa5ea82642b4f3ba93c01b4a6725493d DIST criu-1.8.tar.bz2 534200 SHA256 d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512 de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d WHIRLPOOL 2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f +DIST criu-2.0.tar.bz2 548581 SHA256 e80726cc54f74751ae6f63a5b0cf9a2882ffc3fd2aa11b311da0384635d418ff SHA512 ebe785c3da9d54ba517254f7851f0283ccf3826cba30a07c6c74a7253f2d7235f32bb921623a23e6103a3c3e4461e1bc5dc06484270c8e25929c8e981a8b036f WHIRLPOOL 7999a2aeb40f9a932a8b1d11c842f78c710718f08ca1f29b373c69d34b82ebc7ab9b6a659460a058333d6591b64ef76215cdc2d70760cbd57c4d1444d9abe622 diff --git a/sys-process/criu/criu-2.0.ebuild b/sys-process/criu/criu-2.0.ebuild new file mode 100644 index 0000000..90689a6 --- /dev/null +++ b/sys-process/criu/criu-2.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2016 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}"/${PV}/${P}-flags.patch + epatch "${FILESDIR}"/${PV}/${P}-makefile.patch + epatch "${FILESDIR}"/${PV}/${P}-automagic-libbsd.patch +} + +criu_arch() { + # criu infers the arch from $(uname -m). We never want this to happen. + case ${ARCH} in + amd64) echo "x86";; + arm64) echo "aarch64";; + *) echo "${ARCH}";; + esac +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 DEBUG=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/2.0/criu-2.0-automagic-libbsd.patch b/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch new file mode 100644 index 0000000..3f39ef6 --- /dev/null +++ b/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch @@ -0,0 +1,17 @@ +diff --git a/criu/Makefile.config b/criu/Makefile.config +index aaaca1f..e977bcd 100644 +--- a/criu/Makefile.config ++++ b/criu/Makefile.config +@@ -4,10 +4,12 @@ include ../scripts/feature-tests.mak + + CONFIG_HEADER := include/config.h + ++ifeq ($(SETPROCTITLE),yes) + ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),y) + LIBS += -lbsd + DEFINES += -DCONFIG_HAS_LIBBSD + endif ++endif + + ifeq ($(call pkg-config-check,libselinux),y) + LIBS += -lselinux diff --git a/sys-process/criu/files/2.0/criu-2.0-flags.patch b/sys-process/criu/files/2.0/criu-2.0-flags.patch new file mode 100644 index 0000000..c57573e --- /dev/null +++ b/sys-process/criu/files/2.0/criu-2.0-flags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 7569387..eec3be4 100644 +--- a/Makefile ++++ b/Makefile +@@ -97,8 +97,6 @@ endif + ifeq ($(DEBUG),1) + DEFINES += -DCR_DEBUG + CFLAGS += -O0 -ggdb3 +-else +- CFLAGS += -O2 -g + endif + + CFLAGS += $(WARNINGS) $(DEFINES) 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 new file mode 100644 index 0000000..4c7d67f --- /dev/null +++ b/sys-process/criu/files/2.0/criu-2.0-makefile.patch @@ -0,0 +1,34 @@ +diff --git a/Makefile.install b/Makefile.install +index 6fcf25e..0d12ff9 100644 +--- a/Makefile.install ++++ b/Makefile.install +@@ -5,13 +5,12 @@ PREFIX ?= /usr/local + SBINDIR ?= $(PREFIX)/sbin + MANDIR ?= $(PREFIX)/share/man + SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/ +-LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/ +-LIBDIR ?= $(PREFIX)/lib ++LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/ + INCLUDEDIR ?= $(PREFIX)/include/criu + + # + # For recent Debian/Ubuntu with multiarch support. +-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) ++DEB_HOST_MULTIARCH ?= + ifneq "$(DEB_HOST_MULTIARCH)" "" + LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) + else +diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk +index 10a5d44..6b20569 100644 +--- a/scripts/nmk/scripts/build.mk ++++ b/scripts/nmk/scripts/build.mk +@@ -43,7 +43,9 @@ builtin-name := $(strip $(builtin-name)) + + # + # Link flags. ++ld_filter_flags = -Wl,-O1 -Wl,--as-needed + ld_flags := $(strip $(LDFLAGS) $(ldflags-y)) ++ld_flags := $(filter-out $(ld_filter_flags),$(ld_flags)) + + # + # Prepare targets.
