From 1db39caa60172f86d9f2c1d248e26c87f7ce5676 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Tue, 22 Sep 2020 01:29:20 -0700 Subject: sys-process/criu: revbump 3.14-r1, python no longer optional python is no longer optional, criu target requires crit, which requires pycriu. also check for IA32 emulation only on amd64. and remove RAW_LDFLAGS, it was added by patch which is no longer applied to this version. LDFLAGS still not honored, #728148 Closes: https://bugs.gentoo.org/735636 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev --- sys-process/criu/criu-3.14-r1.ebuild | 133 ----------------------------------- sys-process/criu/criu-3.14-r2.ebuild | 133 +++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 133 deletions(-) delete mode 100644 sys-process/criu/criu-3.14-r1.ebuild create mode 100644 sys-process/criu/criu-3.14-r2.ebuild diff --git a/sys-process/criu/criu-3.14-r1.ebuild b/sys-process/criu/criu-3.14-r1.ebuild deleted file mode 100644 index 17298a55f2c3..000000000000 --- a/sys-process/criu/criu-3.14-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..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 ~ppc64" -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";; - ppc64*) echo "ppc64";; - *) 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 - python_setup -} - -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)" \ - PYTHON="${EPYTHON%.?}" \ - FULL_PYTHON="${PYTHON%.?}" \ - 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 \ - PYTHON="${EPYTHON%.?}" \ - FULL_PYTHON="${PYTHON%.?}" \ - 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/criu-3.14-r2.ebuild b/sys-process/criu/criu-3.14-r2.ebuild new file mode 100644 index 000000000000..0cab02a87743 --- /dev/null +++ b/sys-process/criu/criu-3.14-r2.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..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 ~ppc64" +IUSE="doc selinux setproctitle static-libs" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + dev-libs/protobuf-c + dev-libs/libnl:3 + net-libs/libnet:1.1 + sys-libs/libcap + selinux? ( sys-libs/libselinux ) + setproctitle? ( dev-libs/libbsd )" +DEPEND="${RDEPEND} + doc? ( + app-text/asciidoc + app-text/xmlto + )" +RDEPEND="${RDEPEND} + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/ipaddr[${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" + +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";; + ppc64*) echo "ppc64";; + *) echo "${ARCH}";; + esac +} + +pkg_setup() { + use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION" + linux-info_pkg_setup +} + +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 + python_setup +} + +src_compile() { + local target="all $(usex doc 'docs' '')" + emake \ + HOSTCC="$(tc-getBUILD_CC)" \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + AR="$(tc-getAR)" \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 DEBUG=0 \ + SETPROCTITLE=$(usex setproctitle) \ + ${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 \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ + 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 + + python_foreach_impl install_crit + + if ! use static-libs; then + find "${D}" -name "*.a" -delete || die + fi +} -- cgit v1.2.3-65-gdbad