[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/
commit: 120aaef2153b8f40bd902888dbbf0cf71efb86e9
Author: Patrick McLean gentoo org>
AuthorDate: Sat May 6 00:01:12 2023 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat May 6 00:01:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120aaef2
sys-process/criu: add 3.18
Signed-off-by: Patrick McLean gentoo.org>
sys-process/criu/Manifest | 1 +
sys-process/criu/criu-3.18.ebuild | 183 +
sys-process/criu/files/criu-3.18-buildsystem.patch | 57 +++
3 files changed, 241 insertions(+)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 17a9661b07b3..8c033e463e65 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1 +1,2 @@
DIST criu-3.17.tar.gz 1321713 BLAKE2B
3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e
SHA512
febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804
+DIST criu-3.18.tar.gz 1354367 BLAKE2B
3e6613bc44355d4544541ec399ca462eed12203327f832e3c72ea2ccc772afbe2947f760de452b776299af36576880b189ce7583ce7f74c12225d86d1247c2ab
SHA512
3d15554ebd2d08c8904c23b0aba00d505891c14caa4790c2fd12ad6b20bf4058fd210f1d03fd63aacc5ad8bc47e341396b48abbeb474f1fd43c3023fd1ff9171
diff --git a/sys-process/criu/criu-3.18.ebuild
b/sys-process/criu/criu-3.18.ebuild
new file mode 100644
index ..a87a2907ba4a
--- /dev/null
+++ b/sys-process/criu/criu-3.18.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit toolchain-funcs linux-info distutils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="
+ https://criu.org/
+ https://github.com/checkpoint-restore/
+"
+SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
+IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test
video_cards_amdgpu"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/protobuf-c-1.4.0:=
+ dev-libs/libnl:3=
+ net-libs/libnet:1.1=
+ sys-libs/libcap:=
+ bpf? ( dev-libs/libbpf:= )
+ gnutls? ( net-libs/gnutls:= )
+ nftables? ( net-libs/gnutls:= )
+ selinux? ( sys-libs/libselinux:= )
+ setproctitle? ( dev-libs/libbsd:= )
+ video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+"
+BDEPEND="
+ doc? (
+ app-text/asciidoc
+ app-text/xmlto
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL
~INOTIFY_USER
+ ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/2.2/criu-2.2-flags.patch"
+ "${FILESDIR}/2.3/criu-2.3-no-git.patch"
+ "${FILESDIR}/criu-3.12-automagic-libbsd.patch"
+ "${FILESDIR}/criu-3.18-buildsystem.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";;
+ ppc64*) echo "ppc64";;
+ *) echo "${ARCH}";;
+ esac
+}
+
+pkg_setup() {
+ use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ distutils-r1_src_prepare
+ use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+criu_use() {
+ if ! use "${1}"; then
+ sed \
+ -e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
+ -i Makefile.config || die
+ fi
+}
+
+criu_python() {
+ local -x \
+ CRIU_VERSION_MAJOR="$(ver_cut 1)" \
+ CRIU_VERSION_MINOR=$(ver_cut 2) \
+ CRIU_VERSION_SUBLEVEL=$(ver_cut 3)
+
+ "${@}"
+}
+
+src_configure() {
+ # Gold linker generates invalid object file when used with criu's custom
+ # linker script. Use the bfd linker instead. See
https://crbug.com/839665#c3
+ tc-ld-disable-gold
+
+ # Build system uses this variable as a trigger to append coverage flags
+ # we'd like to avoid it. https://bugs.gentoo.org/744244
+ unset GCOV
+
+ # we have to sed the Makefile.config to disable automagic deps
+ criu_use selinux
+ criu_use bpf
+ criu_use nftables
+ criu_use video_cards_amdgpu libdrm
+
+ emake_opts=(
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/
commit: 97d4262f6c82af3f9c1c73e7d2345198114d92ed
Author: Sam James gentoo org>
AuthorDate: Fri Aug 5 01:02:36 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Aug 5 01:02:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d4262f
sys-process/criu: fix build w/ glibc 2.36
Closes: https://bugs.gentoo.org/863683
Signed-off-by: Sam James gentoo.org>
sys-process/criu/criu-3.17-r1.ebuild | 1 +
sys-process/criu/files/criu-3.17-glibc-2.36.patch | 242 ++
2 files changed, 243 insertions(+)
diff --git a/sys-process/criu/criu-3.17-r1.ebuild
b/sys-process/criu/criu-3.17-r1.ebuild
index 66993d5ce406..ac5e1722d999 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}/criu-3.16.1-buildsystem.patch"
"${FILESDIR}/${P}-amdgpu-build-fixes.patch"
+ "${FILESDIR}/${PN}-3.17-glibc-2.36.patch"
)
criu_arch() {
diff --git a/sys-process/criu/files/criu-3.17-glibc-2.36.patch
b/sys-process/criu/files/criu-3.17-glibc-2.36.patch
new file mode 100644
index ..5387c5a5b97c
--- /dev/null
+++ b/sys-process/criu/files/criu-3.17-glibc-2.36.patch
@@ -0,0 +1,242 @@
+https://bugs.gentoo.org/863683
+https://github.com/checkpoint-restore/criu/pull/1943
+
+From 8cd5fccd6cf3d03afb5abe463134d31f54d42258 Mon Sep 17 00:00:00 2001
+From: Radostin Stoyanov
+Date: Sun, 31 Jul 2022 16:07:30 +
+Subject: [PATCH 2/2] criu: fix conflicting headers
+
+There are several changes in glibc 2.36 that make sys/mount.h header
+incompatible with kernel headers:
+
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+This patch removes conflicting includes for `` and
+updates the content of `criu/include/linux/mount.h` to match
+`/usr/include/sys/mount.h`. In addition, inline definitions sys_*()
+functions have been moved from "linux/mount.h" to "syscall.h" to
+avoid conflicts with `uapi/compel/plugins/std/syscall.h` and
+``. The include for `` has been replaced
+with local include to avoid conflicts with ``.
+
+Fixes: #1949
+
+Signed-off-by: Radostin Stoyanov
+--- a/criu/cgroup.c
b/criu/cgroup.c
+@@ -27,6 +27,7 @@
+ #include "images/cgroup.pb-c.h"
+ #include "kerndat.h"
+ #include "linux/mount.h"
++#include "syscall.h"
+
+ /*
+ * This structure describes set of controller groups
+--- a/criu/cr-check.c
b/criu/cr-check.c
+@@ -21,7 +21,6 @@
+ #include
+ #include
+ #include
+-#include
+
+ #include "../soccr/soccr.h"
+
+@@ -52,6 +51,7 @@
+ #include "net.h"
+ #include "restorer.h"
+ #include "uffd.h"
++#include "linux/aio_abi.h"
+
+ #include "images/inventory.pb-c.h"
+
+--- a/criu/cr-restore.c
b/criu/cr-restore.c
+@@ -22,7 +22,6 @@
+ #include
+ #include "common/compiler.h"
+
+-#include "linux/mount.h"
+ #include "linux/rseq.h"
+
+ #include "clone-noasan.h"
+@@ -86,6 +85,8 @@
+ #include
+ #include "compel/include/asm/syscall.h"
+
++#include "linux/mount.h"
++
+ #include "protobuf.h"
+ #include "images/sa.pb-c.h"
+ #include "images/timer.pb-c.h"
+--- a/criu/include/aio.h
b/criu/include/aio.h
+@@ -1,7 +1,7 @@
+ #ifndef __CR_AIO_H__
+ #define __CR_AIO_H__
+
+-#include
++#include "linux/aio_abi.h"
+ #include "images/mm.pb-c.h"
+ unsigned int aio_estimate_nr_reqs(unsigned int size);
+ int dump_aio_ring(MmEntry *mme, struct vma_area *vma);
+--- /dev/null
b/criu/include/linux/aio_abi.h
+@@ -0,0 +1,14 @@
++#ifndef __LINUX__AIO_ABI_H
++#define __LINUX__AIO_ABI_H
++
++typedef __kernel_ulong_t aio_context_t;
++
++/* read() from /dev/aio returns these structures. */
++struct io_event {
++ __u64 data; /* the data field from the iocb */
++ __u64 obj; /* what iocb this event came from */
++ __s64 res; /* result code for this event */
++ __s64 res2; /* secondary result */
++};
++
++#endif /* __LINUX__AIO_ABI_H */
+--- a/criu/include/linux/mount.h
b/criu/include/linux/mount.h
+@@ -4,32 +4,34 @@
+ #include "common/config.h"
+ #include "compel/plugins/std/syscall-codes.h"
+
+-#ifdef CONFIG_HAS_FSCONFIG
+-#include
+-#else
++/* Copied from /usr/include/sys/mount.h */
++
++#ifndef FSCONFIG_CMD_CREATE
++/* The type of fsconfig call made. */
+ enum fsconfig_command {
+- FSCONFIG_SET_FLAG = 0,/* Set parameter, supplying no value */
+- FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string
value */
+- FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob
value */
+- FSCONFIG_SET_PATH = 3,/* Set parameter, supplying an object by
path */
+- FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by
(empty) path */
+- FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by
fd */
+- FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
++ FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
++#define FSCONFIG_SET_FLAG
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/
commit: d79e10b274201dad47a013ed29a1420877a37ba7
Author: Mike Frysinger chromium org>
AuthorDate: Wed Jun 16 19:50:43 2021 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jun 16 20:09:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79e10b2
sys-process/criu: fix $PKG_CONFIG usage
Needed to properly cross-compile.
Signed-off-by: Mike Frysinger gentoo.org>
sys-process/criu/criu-3.15.ebuild | 2 +
sys-process/criu/files/criu-3.15-pkg-config.patch | 141 ++
2 files changed, 143 insertions(+)
diff --git a/sys-process/criu/criu-3.15.ebuild
b/sys-process/criu/criu-3.15.ebuild
index b9e42cf4fa5..065124a7e5d 100644
--- a/sys-process/criu/criu-3.15.ebuild
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
+ "${FILESDIR}"/${PN}-3.15-pkg-config.patch
)
criu_arch() {
@@ -93,6 +94,7 @@ src_compile() {
CC="$(tc-getCC)" \
LD="$(tc-getLD)" \
AR="$(tc-getAR)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
PYTHON="${EPYTHON%.?}" \
FULL_PYTHON="${PYTHON%.?}" \
OBJCOPY="$(tc-getOBJCOPY)" \
diff --git a/sys-process/criu/files/criu-3.15-pkg-config.patch
b/sys-process/criu/files/criu-3.15-pkg-config.patch
new file mode 100644
index 000..69d83bfc399
--- /dev/null
+++ b/sys-process/criu/files/criu-3.15-pkg-config.patch
@@ -0,0 +1,141 @@
+https://github.com/checkpoint-restore/criu/pull/1517
+
+From d72536d9a821f9ff64f5dd62c9f8a282e3e5ec85 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Wed, 16 Jun 2021 15:43:04 -0400
+Subject: [PATCH] build: respect $PKG_CONFIG settings
+
+The build needs to respect $PKG_CONFIG env var like other standard
+build systems and the the upstream pkg-config project itself. This
+allows the package builder to point it to the right tool when doing
+a cross-compile build. Otherwise the host pkg-config tool is used
+which won't have access to the packages in the cross sysroot.
+
+Signed-off-by: Mike Frysinger
+---
+ Makefile.config | 2 +-
+ criu/Makefile| 2 +-
+ scripts/nmk/scripts/tools.mk | 1 +
+ scripts/nmk/scripts/utils.mk | 2 +-
+ test/zdtm/Makefile.inc | 8 +---
+ test/zdtm/lib/Makefile | 2 +-
+ test/zdtm/static/Makefile| 2 +-
+ 7 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.config b/Makefile.config
+index 3d99e680be7f..6e3e1b062256 100644
+--- a/Makefile.config
b/Makefile.config
+@@ -30,7 +30,7 @@ else
+ endif
+
+ ifeq ($(call pkg-config-check,libnftables),y)
+-LIB_NFTABLES := $(shell pkg-config --libs libnftables)
++LIB_NFTABLES := $(shell $(PKG_CONFIG) --libs libnftables)
+ ifeq ($(call
try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
+ LIBS_FEATURES += $(LIB_NFTABLES)
+ FEATURE_DEFINES += -DCONFIG_HAS_NFTABLES_LIB_API_0
+diff --git a/criu/Makefile b/criu/Makefile
+index ceb49ce09925..11d454c81026 100644
+--- a/criu/Makefile
b/criu/Makefile
+@@ -27,7 +27,7 @@ CFLAGS += -iquote include
+ CFLAGS+= -iquote images
+ CFLAGS+= -iquote $(ARCH_DIR)/include
+ CFLAGS+= -iquote .
+-CFLAGS+= $(shell pkg-config --cflags libnl-3.0)
++CFLAGS+= $(shell $(PKG_CONFIG) --cflags libnl-3.0)
+ CFLAGS+= $(CONFIG-DEFINES)
+
+ ifeq ($(GMON),1)
+diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
+index c5794401c734..1681d4e9092b 100644
+--- a/scripts/nmk/scripts/tools.mk
b/scripts/nmk/scripts/tools.mk
+@@ -17,6 +17,7 @@ AR := $(CROSS_COMPILE)ar
+ STRIP := $(CROSS_COMPILE)strip
+ OBJCOPY := $(CROSS_COMPILE)objcopy
+ OBJDUMP := $(CROSS_COMPILE)objdump
++PKG_CONFIG?= pkg-config
+ NM:= $(CROSS_COMPILE)nm
+ MAKE := make
+ MKDIR := mkdir -p
+diff --git a/scripts/nmk/scripts/utils.mk b/scripts/nmk/scripts/utils.mk
+index b9790615ca7f..f93fdf911cef 100644
+--- a/scripts/nmk/scripts/utils.mk
b/scripts/nmk/scripts/utils.mk
+@@ -16,7 +16,7 @@ try-asm = $(call
try-compile,assembler-with-cpp,$(1),$(2),$(3))
+
+ # pkg-config-check
+ # Usage: ifeq ($(call pkg-config-check, library),y)
+-pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
++pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
+
+ #
+ # Remove duplicates.
+diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
+index 43763321f956..e4af9c51e9e4 100644
+--- a/test/zdtm/Makefile.inc
b/test/zdtm/Makefile.inc
+@@ -37,6 +37,7 @@ HOSTCC ?= gcc
+ ifeq ($(origin CC), default)
+ CC :=
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/
commit: 6b9c2bf74ae78ff90e7ab87393210acfab1e5b71
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Sep 1 07:35:20 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Sep 1 07:35:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b9c2bf7
sys-process/criu: fix build failure against glibc-2.26
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-process/criu/criu-2.12.1.ebuild| 1 +
.../criu/files/criu-2.12.1-glibc-2.26.patch| 49 ++
2 files changed, 50 insertions(+)
diff --git a/sys-process/criu/criu-2.12.1.ebuild
b/sys-process/criu/criu-2.12.1.ebuild
index fd0c92becf6..76b63750a52 100644
--- a/sys-process/criu/criu-2.12.1.ebuild
+++ b/sys-process/criu/criu-2.12.1.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
+ "${FILESDIR}"/${PN}-2.12.1-glibc-2.26.patch
)
criu_arch() {
diff --git a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
new file mode 100644
index 000..d378cc88cff
--- /dev/null
+++ b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
@@ -0,0 +1,49 @@
+From d77d8cc402e597bb38edfb4e81db89fd7d96d0b6 Mon Sep 17 00:00:00 2001
+From: Adrian Reber
+Date: Thu, 29 Jun 2017 14:19:32 +
+Subject: [PATCH] fix building with newer glibc
+
+Newer glibc releases have removed SIGUNUSED from bits/signum.h which
+breaks building criu on those systems:
+
+https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8082d91e1c449e0cb137468b731004a5e605c8c6
+
+SIGSYS returns the same value as SIGUNUSED and testing has shown
+that criu still successfully completes zdtm with this patch.
+
+Signed-off-by: Adrian Reber
+Reviewed-by: Dmitry Safonov
+Signed-off-by: Andrei Vagin
+---
+ criu/cr-restore.c| 1 -
+ test/zdtm/static/pthread01.c | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/criu/cr-restore.c b/criu/cr-restore.c
+index e8fb4adf..6ba50f18 100644
+--- a/criu/cr-restore.c
b/criu/cr-restore.c
+@@ -880,7 +880,6 @@ static void zombie_prepare_signals(void)
+ (1 << SIGPOLL) |\
+ (1 << SIGIO)|\
+ (1 << SIGSYS) |\
+- (1 << SIGUNUSED)|\
+ (1 << SIGSTKFLT)|\
+ (1 << SIGPWR)\
+ )
+diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c
+index 52f849c0..2520fcfe 100644
+--- a/test/zdtm/static/pthread01.c
b/test/zdtm/static/pthread01.c
+@@ -43,7 +43,7 @@ static char *decode_signal(const sigset_t *s, char *buf)
+ COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD);
COLLECT(SIGCONT); COLLECT(SIGSTOP);
+ COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG);
COLLECT(SIGXCPU);
+ COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF);
COLLECT(SIGWINCH); COLLECT(SIGIO);
+- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
++ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
+ #undef COLLECT
+
+ return buf;
+--
+2.14.1
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.9/
commit: 063e59b9f8fe894995b8514523f2c6b69a4efc72
Author: Yixun Lan gentoo org>
AuthorDate: Tue Dec 20 22:49:32 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Dec 20 22:51:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063e59b9
sys-process/criu: version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-process/criu/Manifest | 1 +
sys-process/criu/criu-2.9.ebuild | 96 ++
sys-process/criu/files/2.9/criu-2.9-makefile.patch | 78 ++
3 files changed, 175 insertions(+)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4384ba9..7120b09 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,3 +2,4 @@ DIST criu-2.5.tar.bz2 605226 SHA256
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f13
DIST criu-2.6.tar.bz2 614488 SHA256
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
WHIRLPOOL
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
DIST criu-2.7.tar.bz2 618653 SHA256
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
WHIRLPOOL
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a
DIST criu-2.8.tar.bz2 623257 SHA256
54d77ee2bd31fb900395eeeda8cd653b334dbeb6594f3c3220d8c9e9f55d21f6 SHA512
cc85cec1fd9dc543e2ab24356f33424bd3b962db6da273db85cd1f1e21d08b12d2b937fe673d369b2d2e2b2aaacb4967e00b67ea811f5318028522a55a892454
WHIRLPOOL
39d083f6d3197c9c8ee52b430b053ff372df0860e28850a4893e19ab9721e562a604adac0d8ecb9529ff7931e7ea05b10e771d187f9ed908b70916530f951fad
+DIST criu-2.9.tar.bz2 627584 SHA256
21d1493e71b76fc0219a4274ca98332de3910cdd2e93070dc283ae4fc01421c9 SHA512
ba8d43927a52c2a781921ee9b47db69e19d9ca6f3b80a55b2ebd1139fbe43d93202ea6e19a469ddfaaf4a31e2c37dfc9b59074c209a232c5398c28f1bcc4dc9d
WHIRLPOOL
1974aef132de2ae5d22e6714709f786557af13cdc8b351da4312ca7b98f3aa524c7358e592d8d1b0a3287e505703a6b1e93638db01008c4b3e4f63b725c26d0a
diff --git a/sys-process/criu/criu-2.9.ebuild b/sys-process/criu/criu-2.9.ebuild
new file mode 100644
index ..779320c
--- /dev/null
+++ b/sys-process/criu/criu-2.9.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1
python-utils-r1
+
+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="python setproctitle"
+
+RDEPEND="dev-libs/protobuf-c
+ dev-libs/libnl:3
+ sys-libs/libcap
+ python? ( ${PYTHON_DEPS} )
+ setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto"
+RDEPEND="${RDEPEND}
+ python? (
+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ )"
+
+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"
+
+PATCHES=(
+ "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+ "${FILESDIR}"/2.9/${PN}-2.9-makefile.patch
+ "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+ "${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
+ "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+ "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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() {
+ RAW_LDFLAGS="$(raw-ldflags)" emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ ARCH="$(criu_arch)" \
+ V=1 WERROR=0 DEBUG=0 \
+ SETPROCTITLE=$(usex setproctitle) \
+ PYCRIU=$(usex python) \
+ 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
+}
+
+install_crit() {
+ "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}"
--prefix="${EPREFIX}/usr/"
+}
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.5/
commit: 47f05b40812efe00118e59167b158084b2ecd34c
Author: Yixun Lan gentoo org>
AuthorDate: Thu Aug 25 01:29:43 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Thu Aug 25 05:28:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f05b40
sys-process/criu: version bump
Package-Manager: portage-2.3.0
sys-process/criu/Manifest | 1 +
sys-process/criu/criu-2.5.ebuild | 96 ++
.../criu/files/2.5/criu-2.5-automagic-libbsd.patch | 17
3 files changed, 114 insertions(+)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 0066ee7..0037ca2 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
DIST criu-2.2.tar.bz2 558926 SHA256
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
WHIRLPOOL
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
DIST criu-2.3.tar.bz2 572580 SHA256
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
WHIRLPOOL
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
DIST criu-2.4.tar.bz2 602896 SHA256
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
WHIRLPOOL
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
+DIST criu-2.5.tar.bz2 605226 SHA256
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
WHIRLPOOL
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
new file mode 100644
index ..3f163d5
--- /dev/null
+++ b/sys-process/criu/criu-2.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1
python-utils-r1
+
+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="python setproctitle"
+
+RDEPEND="dev-libs/protobuf-c
+ dev-libs/libnl:3
+ sys-libs/libcap
+ python? ( ${PYTHON_DEPS} )
+ setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto"
+RDEPEND="${RDEPEND}
+ python? (
+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ )"
+
+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"
+
+PATCHES=(
+ "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+ "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
+ "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+ "${FILESDIR}"/2.5/${PN}-2.5-automagic-libbsd.patch
+ "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+ "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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() {
+ RAW_LDFLAGS="$(raw-ldflags)" emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ ARCH="$(criu_arch)" \
+ V=1 WERROR=0 DEBUG=0 \
+ SETPROCTITLE=$(usex setproctitle) \
+ PYCRIU=$(usex python) \
+ 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
+}
+
+install_crit() {
+ "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}"
--prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+ emake \
+ ARCH="$(criu_arch)" \
+ PREFIX="${EPREFIX}"/usr
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.4/
commit: 960a994558dfd82011f8cd6db61d75b269cf4a79
Author: Yixun Lan gentoo org>
AuthorDate: Tue Jul 26 06:15:12 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Jul 26 06:15:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960a9945
sys-process/criu: version bump 2.4
Package-Manager: portage-2.3.0
sys-process/criu/Manifest | 1 +
sys-process/criu/criu-2.4.ebuild | 95 ++
sys-process/criu/files/2.4/criu-2.4-makefile.patch | 78 ++
3 files changed, 174 insertions(+)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index ba77989..23ee5a1 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,3 +2,4 @@ DIST criu-1.8.tar.bz2 534200 SHA256
d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c7
DIST criu-2.1.tar.bz2 556820 SHA256
7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512
19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439
WHIRLPOOL
4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
DIST criu-2.2.tar.bz2 558926 SHA256
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
WHIRLPOOL
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
DIST criu-2.3.tar.bz2 572580 SHA256
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
WHIRLPOOL
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
+DIST criu-2.4.tar.bz2 602896 SHA256
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
WHIRLPOOL
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
diff --git a/sys-process/criu/criu-2.4.ebuild b/sys-process/criu/criu-2.4.ebuild
new file mode 100644
index 000..e17b58a
--- /dev/null
+++ b/sys-process/criu/criu-2.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1
python-utils-r1
+
+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="python setproctitle"
+
+RDEPEND="dev-libs/protobuf-c
+ dev-libs/libnl:3
+ python? ( ${PYTHON_DEPS} )
+ setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto"
+RDEPEND="${RDEPEND}
+ python? (
+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ )"
+
+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"
+
+PATCHES=(
+ "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+ "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
+ "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+ "${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
+ "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+ "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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() {
+ RAW_LDFLAGS="$(raw-ldflags)" emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ ARCH="$(criu_arch)" \
+ V=1 WERROR=0 DEBUG=0 \
+ SETPROCTITLE=$(usex setproctitle) \
+ PYCRIU=$(usex python) \
+ 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
+}
+
+install_crit() {
+ "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}"
--prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+ emake \
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.3/
commit: 7e8fcadffb8f78e9a2c4f32543373e096990850a
Author: Yixun Lan gentoo org>
AuthorDate: Fri Jun 24 10:06:38 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Fri Jun 24 10:07:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8fcadf
sys-process/criu: version bump 2.3
Package-Manager: portage-2.3.0_rc1
sys-process/criu/Manifest| 1 +
sys-process/criu/criu-2.3.ebuild | 94
sys-process/criu/files/2.3/criu-2.3-no-git.patch | 16
3 files changed, 111 insertions(+)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 5e82180..ba77989 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
DIST criu-1.8.tar.bz2 534200 SHA256
d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512
de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d
WHIRLPOOL
2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f
DIST criu-2.1.tar.bz2 556820 SHA256
7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512
19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439
WHIRLPOOL
4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
DIST criu-2.2.tar.bz2 558926 SHA256
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
WHIRLPOOL
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
+DIST criu-2.3.tar.bz2 572580 SHA256
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
WHIRLPOOL
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
diff --git a/sys-process/criu/criu-2.3.ebuild b/sys-process/criu/criu-2.3.ebuild
new file mode 100644
index 000..971a670
--- /dev/null
+++ b/sys-process/criu/criu-2.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1
python-utils-r1
+
+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="python setproctitle"
+
+RDEPEND="dev-libs/protobuf-c
+ dev-libs/libnl:3
+ python? ( ${PYTHON_DEPS} )
+ setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto"
+RDEPEND="${RDEPEND}
+ python? (
+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ )"
+
+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"
+
+PATCHES=(
+ "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+ "${FILESDIR}"/2.2/${PN}-2.2-makefile.patch
+ "${FILESDIR}"/${PV}/${P}-no-git.patch
+ "${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
+ "${FILESDIR}"/2.0/${PN}-2.0-sysroot.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() {
+ RAW_LDFLAGS="$(raw-ldflags)" emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ ARCH="$(criu_arch)" \
+ V=1 WERROR=0 DEBUG=0 \
+ SETPROCTITLE=$(usex setproctitle) \
+ PYCRIU=$(usex python) \
+ 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
+}
+
+install_crit() {
+ "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}"
--prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+ emake \
+ ARCH="$(criu_arch)" \
+ PREFIX="${EPREFIX}"/usr \
+ LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.1/
commit: 2ade38cda74f8939e478589883047e0c2af92e8e
Author: Yixun Lan gentoo org>
AuthorDate: Mon Apr 25 07:05:21 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Mon Apr 25 07:37:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ade38cd
sys-process/criu: version bump 2.1
Package-Manager: portage-2.2.28
sys-process/criu/Manifest | 1 +
sys-process/criu/criu-2.1.ebuild | 93 ++
sys-process/criu/files/2.1/criu-2.1-makefile.patch | 75 +
3 files changed, 169 insertions(+)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 77aa45f..8eb6929 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,3 +2,4 @@ DIST criu-1.6.1.tar.bz2 484598 SHA256
c74810383b7e524be0d909b9a6c1805e0887ac93cf
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
+DIST criu-2.1.tar.bz2 556820 SHA256
7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512
19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439
WHIRLPOOL
4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
diff --git a/sys-process/criu/criu-2.1.ebuild b/sys-process/criu/criu-2.1.ebuild
new file mode 100644
index 000..40e9317
--- /dev/null
+++ b/sys-process/criu/criu-2.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1
python-utils-r1
+
+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="python setproctitle"
+
+RDEPEND="dev-libs/protobuf-c
+ dev-libs/libnl:3
+ python? ( ${PYTHON_DEPS} )
+ setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto"
+RDEPEND="${RDEPEND}
+ python? (
+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ )"
+
+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}"/2.0/${PN}-2.0-flags.patch
+ epatch "${FILESDIR}"/${PV}/${P}-makefile.patch
+ epatch "${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
+ epatch "${FILESDIR}"/2.0/${PN}-2.0-sysroot.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() {
+ RAW_LDFLAGS="$(raw-ldflags)" emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ ARCH="$(criu_arch)" \
+ V=1 WERROR=0 DEBUG=0 \
+ SETPROCTITLE=$(usex setproctitle) \
+ PYCRIU=$(usex python) \
+ 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
+}
+
+install_crit() {
+ "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}"
--prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+ emake \
+ ARCH="$(criu_arch)" \
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.0/
commit: 9d0fde94a897009dcd5c6a04ad599fa66d68cdec
Author: Yixun Lan gentoo org>
AuthorDate: Mon Mar 21 06:06:37 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Mon Mar 21 06:06:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0fde94
sys-process/criu: fix LIBDIR path, using $(get_libdir)
Package-Manager: portage-2.2.27
sys-process/criu/criu-2.0.ebuild | 2 +
sys-process/criu/files/2.0/criu-2.0-makefile.patch | 67 --
2 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/sys-process/criu/criu-2.0.ebuild b/sys-process/criu/criu-2.0.ebuild
index b8c2198..51da20c 100644
--- a/sys-process/criu/criu-2.0.ebuild
+++ b/sys-process/criu/criu-2.0.ebuild
@@ -56,6 +56,7 @@ src_compile() {
CC="$(tc-getCC)" \
LD="$(tc-getLD)" \
OBJCOPY="$(tc-getOBJCOPY)" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
ARCH="$(criu_arch)" \
V=1 WERROR=0 DEBUG=0 \
SETPROCTITLE=$(usex setproctitle) \
@@ -80,6 +81,7 @@ src_install() {
PREFIX="${EPREFIX}"/usr \
LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
DESTDIR="${D}" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
install
dodoc CREDITS README.md
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
index b9c9cb4..a2783c7 100644
--- a/sys-process/criu/files/2.0/criu-2.0-makefile.patch
+++ b/sys-process/criu/files/2.0/criu-2.0-makefile.patch
@@ -1,40 +1,36 @@
-Index: criu-2.0/Makefile.install
-===
criu-2.0.orig/Makefile.install
-+++ criu-2.0/Makefile.install
-@@ -5,13 +5,12 @@ PREFIX ?= /usr/local
+diff --git a/Makefile.install b/Makefile.install
+index 6fcf25e..103373b 100644
+--- a/Makefile.install
b/Makefile.install
+@@ -5,23 +5,10 @@ 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/
+ LIBDIR?= $(PREFIX)/lib
INCLUDEDIR?= $(PREFIX)/include/criu
- #
- # For recent Debian/Ubuntu with multiarch support.
+-#
+-# 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
-Index: criu-2.0/scripts/nmk/scripts/build.mk
-===
criu-2.0.orig/scripts/nmk/scripts/build.mk
-+++ criu-2.0/scripts/nmk/scripts/build.mk
-@@ -43,7 +43,7 @@ builtin-name := $(strip $(builtin-name))
+-ifneq "$(DEB_HOST_MULTIARCH)" ""
+-LIBDIR?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+-else
+-#
+-# For most other systems
+-ifeq "$(shell uname -m)" "x86_64"
+-LIBDIR?= $(PREFIX)/lib64
+-endif
+-endif
+-
+ export SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
+ export INCLUDEDIR LIBDIR DESTDIR PREFIX
- #
- # Link flags.
--ld_flags := $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags := $(strip $(RAW_LDFLAGS) $(ldflags-y))
-
- #
- # Prepare targets.
-Index: criu-2.0/lib/Makefile
-===
criu-2.0.orig/lib/Makefile
-+++ criu-2.0/lib/Makefile
+diff --git a/lib/Makefile b/lib/Makefile
+index 0cd59a1..63bdaba 100644
+--- a/lib/Makefile
b/lib/Makefile
@@ -20,10 +20,12 @@ PHONY += lib-c
#
@@ -57,7 +53,7 @@ Index: criu-2.0/lib/Makefile
$(E) " INSTALL " $(CRIU_SO)
$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
$(Q) install -m 755 c/$(CRIU_SO)
$(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
-@@ -49,8 +51,6 @@ install: lib-c lib-py ../crit/crit c/cri
+@@ -49,8 +51,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),'
-e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
@@ -66,3 +62,16 @@ Index: criu-2.0/lib/Makefile
.PHONY: install
.PHONY: $(PHONY) clean
+diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
+index 10a5d44..ffe2a3c 100644
+--- a/scripts/nmk/scripts/build.mk
b/scripts/nmk/scripts/build.mk
+@@ -43,7 +43,7 @@ builtin-name := $(strip $(builtin-name))
+
+ #
+ # Link flags.
+-ld_flags := $(strip $(LDFLAGS) $(ldflags-y))
++ld_flags := $(strip $(RAW_LDFLAGS)
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.0/
commit: 5d4129aba42824c0587957c470959ec9bda1866e
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Mar 15 15:12:42 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Mar 15 15:12:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d4129ab
sys-process/criu: inject SYSROOT into the makefiles for libnl3 cflags so that
target include dir is used instead of host.
Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier gentoo.org>
sys-process/criu/criu-2.0.ebuild | 1 +
sys-process/criu/files/2.0/criu-2.0-sysroot.patch | 15 +++
2 files changed, 16 insertions(+)
diff --git a/sys-process/criu/criu-2.0.ebuild b/sys-process/criu/criu-2.0.ebuild
index c1c17f8..b8c2198 100644
--- a/sys-process/criu/criu-2.0.ebuild
+++ b/sys-process/criu/criu-2.0.ebuild
@@ -39,6 +39,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PV}/${P}-flags.patch
epatch "${FILESDIR}"/${PV}/${P}-makefile.patch
epatch "${FILESDIR}"/${PV}/${P}-automagic-libbsd.patch
+ epatch "${FILESDIR}"/${PV}/${P}-sysroot.patch
}
criu_arch() {
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
new file mode 100644
index 000..333c564
--- /dev/null
+++ b/sys-process/criu/files/2.0/criu-2.0-sysroot.patch
@@ -0,0 +1,15 @@
+Using host headers when cross compiling is not a great idea.
+
+Index: criu-2.0/criu/Makefile
+===
+--- criu-2.0.orig/criu/Makefile
criu-2.0/criu/Makefile
+@@ -51,7 +51,7 @@ ccflags-y+= -iquote $(SRC_DIR)/criu/pi
+ ccflags-y += -iquote $(SRC_DIR)/criu/$(ARCH_DIR)
+ ccflags-y += -iquote $(SRC_DIR)/criu/$(ARCH_DIR)/include
+ ccflags-y += -iquote $(SRC_DIR)/
+-ccflags-y += -I/usr/include/libnl3
++ccflags-y += -I${SYSROOT}/usr/include/libnl3
+
+ export ccflags-y
+
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.0/
commit: 2a92970a3998e8bf09883c771690b4eab0b71c2b
Author: Yixun Lan gentoo org>
AuthorDate: Tue Mar 15 03:11:51 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Mar 15 03:20:18 2016 +
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 000..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 000..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
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/
commit: a3349d9b0e53ec36aaa031d1fa41195ab7a1dd27
Author: Yixun Lan gentoo org>
AuthorDate: Thu Nov 5 08:11:15 2015 +
Commit: Yixun Lan gentoo org>
CommitDate: Thu Nov 5 08:12:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3349d9b
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 --
.../criu/{criu-1.7.ebuild => criu-1.7.2.ebuild}| 0
.../criu/files/criu-1.5.1-arm64-ptrace.patch | 12 --
4 files changed, 1 insertion(+), 64 deletions(-)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 02bfa5e..03a83ef 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 55dad0c..000
--- 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.ebuild
b/sys-process/criu/criu-1.7.2.ebuild
similarity index 100%
rename from sys-process/criu/criu-1.7.ebuild
rename to sys-process/criu/criu-1.7.2.ebuild
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 4978381..000
--- 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"
[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/
commit: 5e480fbea3092065653bd04cdbf0c257f687985f
Author: Yixun Lan gentoo org>
AuthorDate: Fri Oct 9 04:20:54 2015 +
Commit: Yixun Lan gentoo org>
CommitDate: Fri Oct 9 04:24:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e480fbe
sys-process/criu: version bump 1.7, drop 1.6-r1
Package-Manager: portage-2.2.22
sys-process/criu/Manifest | 2 +-
.../criu/{criu-1.6-r1.ebuild => criu-1.7.ebuild} | 2 +-
.../criu/files/criu-1.7-automagic-libbsd.patch | 29 ++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4fda2d0..02bfa5e 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,3 @@
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.6.tar.bz2 484513 SHA256
35ba6f5df90bfb8a25ae5e53459272bb37b8a69790e084f86d7a9ffa0df35993 SHA512
0672c7342ffed7c23fdb747b7bd3b08f205a4bf3965577991d007f71e70be5243247e52ad823f0099713f7977f6f4be5403ea2073a840b5024b6a0f240f65bdc
WHIRLPOOL
da5a767b3f89efdd2cda21331cc60e60e0cdbab163a55ef1a3080d3601df924688d612c7e76000c3d383cdb22002b16c28ad2740b7bc6aba784021f31ebc54c4
+DIST criu-1.7.tar.bz2 507224 SHA256
977cf03d94415c2858581bb9894cfb90ac0c0b4b045e9bfa7c04c230aae01a21 SHA512
2d270ae68daa7ff96e5765220ee43b42f8cbbc7e6e2013209dbf69f6bcfba6ca89a632f70734e30fbc9d2985566913d0cae7b28ef6fb4f8aacb3badef2f8e69c
WHIRLPOOL
66324e4161bbe879c5cf1e7e94868bfa65007556aa5c24b8d1dcb09b6ac4731190cf178b70ef66e090e774492f3c8e465277a744b0a61a2ef6c1f30217ea76b3
diff --git a/sys-process/criu/criu-1.6-r1.ebuild
b/sys-process/criu/criu-1.7.ebuild
similarity index 96%
rename from sys-process/criu/criu-1.6-r1.ebuild
rename to sys-process/criu/criu-1.7.ebuild
index 3806853..23070e8 100644
--- a/sys-process/criu/criu-1.6-r1.ebuild
+++ b/sys-process/criu/criu-1.7.ebuild
@@ -29,7 +29,7 @@ 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
+ epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch
}
criu_arch() {
diff --git a/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
new file mode 100644
index 000..4dadf95
--- /dev/null
+++ b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile.config b/Makefile.config
+index ce4b8d8..2ef64d3 100644
+--- a/Makefile.config
b/Makefile.config
+@@ -3,10 +3,12 @@ include scripts/feature-tests.mak
+
+ CONFIG:= include/config.h
+
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y)
+ LIBS += -lbsd
+ DEFINES += -DCONFIG_HAS_LIBBSD
+ endif
++endif
+
+ ifeq ($(call pkg-config-check,libselinux),y)
+ LIBS := -lselinux $(LIBS)
+@@ -38,9 +40,11 @@ endif
+ ifeq ($(VDSO),y)
+ $(Q) @echo '#define CONFIG_VDSO' >> $@
+ endif
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(SETPROCTITLE_INIT_TEST),-lbsd),y)
+ $(Q) @echo '#define CONFIG_HAS_SETPROCTITLE_INIT' >> $@
+ endif
++endif
+ ifeq ($(piegen-y),y)
+ $(Q) @echo '#define CONFIG_PIEGEN' >> $@
+ endif
