summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYixun Lan <dlan@gentoo.org>2016-07-26 14:36:06 +0800
committerYixun Lan <dlan@gentoo.org>2016-07-26 14:36:17 +0800
commitd72db90cfb69be1008d0b810d910b1110d7e85dc (patch)
tree1205479dcc57a7a1056f6a4629965c60f9f85162 /sys-process
parentnet-misc/connman: version bump 1.33 (diff)
downloadgentoo-d72db90cfb69be1008d0b810d910b1110d7e85dc.tar.gz
gentoo-d72db90cfb69be1008d0b810d910b1110d7e85dc.tar.bz2
gentoo-d72db90cfb69be1008d0b810d910b1110d7e85dc.zip
sys-process/criu: drop old
Package-Manager: portage-2.3.0
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/criu/Manifest2
-rw-r--r--sys-process/criu/criu-1.8.ebuild72
-rw-r--r--sys-process/criu/criu-2.1.ebuild93
-rw-r--r--sys-process/criu/files/2.0/criu-2.0-flags.patch13
-rw-r--r--sys-process/criu/files/2.1/criu-2.1-makefile.patch75
-rw-r--r--sys-process/criu/files/criu-1.3.1-flags.patch55
-rw-r--r--sys-process/criu/files/criu-1.7-automagic-libbsd.patch29
-rw-r--r--sys-process/criu/files/criu-1.8-makefile.patch25
8 files changed, 0 insertions, 364 deletions
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 23ee5a15f11c..0066ee78b8b2 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,5 +1,3 @@
-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
DIST criu-2.4.tar.bz2 602896 SHA256 2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72 WHIRLPOOL 9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
diff --git a/sys-process/criu/criu-1.8.ebuild b/sys-process/criu/criu-1.8.ebuild
deleted file mode 100644
index 120c6daccaa8..000000000000
--- a/sys-process/criu/criu-1.8.ebuild
+++ /dev/null
@@ -1,72 +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.8-makefile.patch
- epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch
-}
-
-criu_arch() {
- # criu infers the arch from $(uname -m). We never want this to happen.
- case ${ARCH} in
- amd64) echo "x86_64";;
- arm64) echo "aarch64";;
- x86) echo "i386";;
- *) echo "${ARCH}";;
- esac
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- ARCH="$(criu_arch)" \
- V=1 WERROR=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/criu-2.1.ebuild b/sys-process/criu/criu-2.1.ebuild
deleted file mode 100644
index 40e9317daece..000000000000
--- a/sys-process/criu/criu-2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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)" \
- 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.0/criu-2.0-flags.patch b/sys-process/criu/files/2.0/criu-2.0-flags.patch
deleted file mode 100644
index c57573e7bce4..000000000000
--- a/sys-process/criu/files/2.0/criu-2.0-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.1/criu-2.1-makefile.patch b/sys-process/criu/files/2.1/criu-2.1-makefile.patch
deleted file mode 100644
index fb316391aa60..000000000000
--- a/sys-process/criu/files/2.1/criu-2.1-makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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/
-+LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/
- LIBDIR ?= $(PREFIX)/lib
- INCLUDEDIR ?= $(PREFIX)/include/criu
-
--#
--# 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 SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
- export INCLUDEDIR LIBDIR DESTDIR PREFIX
-
-diff --git a/lib/Makefile b/lib/Makefile
-index f372a52..7312fcb 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -21,8 +21,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
-@@ -39,7 +43,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)
-@@ -51,6 +55,4 @@ 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 ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
- .PHONY: install
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
-index bd40944..3cfbffa 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.
diff --git a/sys-process/criu/files/criu-1.3.1-flags.patch b/sys-process/criu/files/criu-1.3.1-flags.patch
deleted file mode 100644
index 84f503770557..000000000000
--- a/sys-process/criu/files/criu-1.3.1-flags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- criu-1.3.1/Makefile
-+++ criu-1.3.1/Makefile
-@@ -102,9 +102,6 @@
-
- ifeq ($(DEBUG),1)
- DEFINES += -DCR_DEBUG
-- CFLAGS += -O0 -ggdb3
--else
-- CFLAGS += -O2
- endif
-
- ifeq ($(GMON),1)
---- criu-1.3.1/test/zdtm/lib/Makefile
-+++ criu-1.3.1/test/zdtm/lib/Makefile
-@@ -1,6 +1,6 @@
- include ../Makefile.inc
-
--CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
-+CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
- CFLAGS += $(USERCFLAGS)
-
- LIBDIR = .
---- criu-1.3.1/test/zdtm/live/static/Makefile
-+++ criu-1.3.1/test/zdtm/live/static/Makefile
-@@ -3,7 +3,7 @@
- LIBDIR = ../../lib
- LIB = $(LIBDIR)/libzdtmtst.a
- override CPPFLAGS += -I$(LIBDIR)
--CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
-+CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
- CFLAGS += $(USERCFLAGS)
-
- TST_NOFILE = \
---- criu-1.3.1/test/zdtm/live/streaming/Makefile
-+++ criu-1.3.1/test/zdtm/live/streaming/Makefile
-@@ -3,7 +3,7 @@
- LIBDIR = ../../lib
- LIB = $(LIBDIR)/libzdtmtst.a
- override CPPFLAGS += -I$(LIBDIR)
--CFLAGS = -g -O2 -Wall -Werror -fno-strict-aliasing
-+CFLAGS = -Wall -fno-strict-aliasing
- CFLAGS += $(USERCFLAGS)
-
- TST_NOFILE = \
---- criu-1.3.1/test/zdtm/live/transition/Makefile
-+++ criu-1.3.1/test/zdtm/live/transition/Makefile
-@@ -3,7 +3,7 @@
- LIBDIR = ../../lib
- LIB = $(LIBDIR)/libzdtmtst.a
- override CPPFLAGS += -I$(LIBDIR)
--CFLAGS = -g -O2 -Wall -Werror
-+CFLAGS = -Wall
- CFLAGS += $(USERCFLAGS)
-
- TST_NOFILE = \
diff --git a/sys-process/criu/files/criu-1.7-automagic-libbsd.patch b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
deleted file mode 100644
index 4dadf95daa1a..000000000000
--- a/sys-process/criu/files/criu-1.7-automagic-libbsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
diff --git a/sys-process/criu/files/criu-1.8-makefile.patch b/sys-process/criu/files/criu-1.8-makefile.patch
deleted file mode 100644
index 2c1921f55f58..000000000000
--- a/sys-process/criu/files/criu-1.8-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile.inc b/Makefile.inc
-index 5f0a552..4abc9ab 100644
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -15,16 +15,11 @@ PREFIX ?= /usr/local
- SBINDIR ?= $(PREFIX)/sbin
- MANDIR ?= $(PREFIX)/share/man
- SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/
--LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/
--LIBDIR ?= $(PREFIX)/lib
--# 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)
--# For most other systems
--else ifeq "$(shell uname -m)" "x86_64"
-+LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/
-+ifeq "$(shell uname -m)" "x86_64"
- LIBDIR ?= $(PREFIX)/lib64
-+else
-+LIBDIR ?= $(PREFIX)/lib
- endif
-
- INCLUDEDIR ?= $(PREFIX)/include/criu