commit: 063e59b9f8fe894995b8514523f2c6b69a4efc72 Author: Yixun Lan <dlan <AT> gentoo <DOT> org> AuthorDate: Tue Dec 20 22:49:32 2016 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Dec 20 22:51:44 2016 +0000 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 00000000..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/" +} + +src_install() { + emake \ + ARCH="$(criu_arch)" \ + PREFIX="${EPREFIX}"/usr \ + LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install + + dodoc CREDITS README.md + + if use python ; then + cd lib + python_foreach_impl install_crit + fi +} diff --git a/sys-process/criu/files/2.9/criu-2.9-makefile.patch b/sys-process/criu/files/2.9/criu-2.9-makefile.patch new file mode 100644 index 00000000..7ec91ee --- /dev/null +++ b/sys-process/criu/files/2.9/criu-2.9-makefile.patch @@ -0,0 +1,78 @@ +diff --git a/Makefile.install b/Makefile.install +index dbc22e1..23fd1ae 100644 +--- a/Makefile.install ++++ b/Makefile.install +@@ -6,24 +6,11 @@ BINDIR ?= $(PREFIX)/bin + SBINDIR ?= $(PREFIX)/sbin + MANDIR ?= $(PREFIX)/share/man + SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/ +-LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/ ++LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/ + LIBDIR ?= $(PREFIX)/lib + INCLUDEDIR ?= $(PREFIX)/include/criu + LIBEXECDIR ?= $(PREFIX)/libexec + +-# +-# For recent Debian/Ubuntu with multiarch support. +-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) +-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 BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR + export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR + +diff --git a/lib/Makefile b/lib/Makefile +index 616f089..aab3189 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO) + # + # Python bindings. + lib-py: ++ifeq ($(PYCRIU),yes) + $(call msg-gen, $@) + $(Q) $(MAKE) -C py all ++else ++ $(Q) echo "no py criu" ++endif + .PHONY: lib-py + + all: lib-c lib-py +@@ -43,7 +47,7 @@ clean: + $(Q) $(RM) -r build usr + .PHONY: clean + +-install: lib-c lib-py ../crit/crit c/criu.pc.in ++install: lib-c ../crit/crit c/criu.pc.in + $(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) +@@ -55,8 +59,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 +- $(E) " INSTALL " crit +- $(Q) $(PYTHON_BIN) ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) + .PHONY: install + + uninstall: +diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk +index 1860d58..e169b0c 100644 +--- a/scripts/nmk/scripts/build.mk ++++ b/scripts/nmk/scripts/build.mk +@@ -87,7 +87,7 @@ builtin-name := $(strip $(builtin-name)) + + # + # Link flags. +-ld_flags := $(strip $(LDFLAGS) $(ldflags-y)) ++ld_flags := $(strip $(RAW_LDFLAGS) $(ldflags-y)) + + # + # $(obj) related rules.
