From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5739C1382C5 for ; Fri, 15 May 2020 17:36:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 750F9E0949; Fri, 15 May 2020 17:36:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43DF5E0949 for ; Fri, 15 May 2020 17:36:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3DCA34F0C0 for ; Fri, 15 May 2020 17:36:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58563235 for ; Fri, 15 May 2020 17:36:47 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1589564196.04700d5b9b6e6b534c70212d8b124efa9572a208.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/criu/Manifest sys-process/criu/criu-3.14.ebuild sys-process/criu/metadata.xml X-VCS-Directories: sys-process/criu/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 04700d5b9b6e6b534c70212d8b124efa9572a208 X-VCS-Branch: master Date: Fri, 15 May 2020 17:36:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 21186430-17ab-4720-b6d7-bce4d0ac98d9 X-Archives-Hash: 1f7d1854c8b3d5105ab57ab809a96621 commit: 04700d5b9b6e6b534c70212d8b124efa9572a208 Author: Patrick McLean sony com> AuthorDate: Fri May 15 17:36:16 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri May 15 17:36:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04700d5b sys-process/criu-3.14: Version bump, eapi=7, py3 (bug #713054) Closes: https://bugs.gentoo.org/713054 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrick McLean gentoo.org> sys-process/criu/Manifest | 1 + sys-process/criu/criu-3.14.ebuild | 127 ++++++++++++++++++++++++++++++++++++++ sys-process/criu/metadata.xml | 4 ++ 3 files changed, 132 insertions(+) diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index 3513936cd09..7ebc2ced395 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -1,3 +1,4 @@ DIST criu-3.11.tar.bz2 809858 BLAKE2B 873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e SHA512 d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a DIST criu-3.12.tar.bz2 820168 BLAKE2B ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca SHA512 bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0 +DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586 diff --git a/sys-process/criu/criu-3.14.ebuild b/sys-process/criu/criu-3.14.ebuild new file mode 100644 index 00000000000..9ffb3cc47e9 --- /dev/null +++ b/sys-process/criu/criu-3.14.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit toolchain-funcs linux-info flag-o-matic python-r1 + +DESCRIPTION="utility to checkpoint/restore a process tree" +HOMEPAGE="https://criu.org/" +SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64" +IUSE="doc python selinux setproctitle static-libs" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + dev-libs/protobuf-c + dev-libs/libnl:3 + net-libs/libnet:1.1 + sys-libs/libcap + python? ( ${PYTHON_DEPS} ) + selinux? ( sys-libs/libselinux ) + setproctitle? ( dev-libs/libbsd )" +DEPEND="${RDEPEND} + doc? ( + app-text/asciidoc + app-text/xmlto + )" +RDEPEND="${RDEPEND} + python? ( + dev-python/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 ~TUN + ~NETFILTER_XT_MARK" + +# root access required for tests +RESTRICT="test" + +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 +) + +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_prepare() { + default + + if ! use selinux; then + sed \ + -e 's:libselinux:no_libselinux:g' \ + -i Makefile.config || die + fi + + use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install +} + +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 +} + +src_compile() { + local target="all $(usex doc 'docs' '')" + RAW_LDFLAGS="$(raw-ldflags)" emake \ + HOSTCC="$(tc-getBUILD_CC)" \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + AR="$(tc-getAR)" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 DEBUG=0 \ + SETPROCTITLE=$(usex setproctitle) \ + PYCRIU=$(usex python) \ + ${target} +} + +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() { + "${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die + python_optimize +} + +src_install() { + emake \ + ARCH="$(criu_arch)" \ + PREFIX="${EPREFIX}"/usr \ + LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + V=1 WERROR=0 DEBUG=0 \ + install + + use doc && dodoc CREDITS README.md + + if use python ; then + python_foreach_impl install_crit + fi + + if ! use static-libs; then + find "${D}" -name "*.a" -delete || die + fi +} diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml index cba283f8ff9..fe7c191b439 100644 --- a/sys-process/criu/metadata.xml +++ b/sys-process/criu/metadata.xml @@ -1,6 +1,10 @@ + + chutzpah@gentoo.org + Patrick McLean + virtualization@gentoo.org Gentoo Virtualization Project