diff --git a/criu-3.0.tar.bz2 b/criu-3.0.tar.bz2 deleted file mode 100644 index 72a6c72..0000000 --- a/criu-3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7121f67ec82bbce1651c03a752f352f16986c1b1c51a29f5174556fb94c18cd7 -size 676983 diff --git a/criu-3.2.tar.bz2 b/criu-3.2.tar.bz2 new file mode 100644 index 0000000..f2a9685 --- /dev/null +++ b/criu-3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c72f1c1188af05dde1dee850cf72d1a5c3d684761ad6597d83020f7431690527 +size 681789 diff --git a/criu-correct-ppc64-AT_VECTOR_SIZE_ARCH.patch b/criu-correct-ppc64-AT_VECTOR_SIZE_ARCH.patch new file mode 100644 index 0000000..7574a99 --- /dev/null +++ b/criu-correct-ppc64-AT_VECTOR_SIZE_ARCH.patch @@ -0,0 +1,15 @@ +--- + criu/arch/ppc64/include/asm/types.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/criu/arch/ppc64/include/asm/types.h ++++ b/criu/arch/ppc64/include/asm/types.h +@@ -29,7 +29,7 @@ static inline uint64_t encode_pointer(vo + * include/linux/mm_types.h + */ + #define AT_VECTOR_SIZE_BASE 20 +-#define AT_VECTOR_SIZE_ARCH 6 ++#define AT_VECTOR_SIZE_ARCH 14 + #define AT_VECTOR_SIZE (2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1)) + + typedef uint64_t auxv_t; diff --git a/criu-py-install-fix.diff b/criu-py-install-fix.diff new file mode 100644 index 0000000..fb3b9f6 --- /dev/null +++ b/criu-py-install-fix.diff @@ -0,0 +1,15 @@ +--- + lib/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -56,7 +56,7 @@ install: lib-c lib-py crit/crit lib/c/cr + $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc + $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig + $(E) " INSTALL " crit +- $(Q) $(PYTHON_BIN) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) ++ $(Q) $(PYTHON_BIN) scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) + .PHONY: install + + uninstall: diff --git a/criu.changes b/criu.changes index b9dc0d5..a691b40 100644 --- a/criu.changes +++ b/criu.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Tue Jun 20 12:26:00 CEST 2017 - tiwai@suse.de + +- update to criu 3.1: + New features: + * Each boolean option now has the --no-$option pair + * RSS explorer in CRIT + * Multiple plugins in compel + * Run-time check of 32-mmap BUG on x86 + * C/R of 32-bit futex robust list on x86 + Optimizations/improvements: + * Start time is improved significantly with kerndat cache + * Sigaction image is merged into Core + * Unneeded stages are skipped during restore + * Restore w/o namespaces uses host /proc + * Restore w/o namespaces doesn't parse host mounts (not needed) + * Single-threaded tasks do not parse /proc/pid/task/ in vain + * BFD engine is used for more /proc files + * More verbosity in libsoccr + * Fsnotify dump w/o namespaces doesn't walk mounts tree + Bugfixes: + * Python bindings left zombie in self-dump mode + * The last_pid sys-control was reset by restore + * Threads caps were compared with mistake + * make install put crit/pycriu to wrong place if DESTDIR was not set + * Fsnotifies C/R w/o namespaces restored with errors + * Inherited control terminal restore was failed (but dump succeeded) + +- update to criu 3.2: + Optimizations/improvements: + * Invisible files restore is de-serialized + * VMAs restore performance is improved significantly + - Mappings of the same file re-use the descriptor, not re-open it + every time + - Not-COW-ed mappings are restored in-place and are not mremmap()ed + - Empty RO mappings are mmap()ed as such and thus not re-mprotect()ed + at the end + * More verbosity in case TCP locking fails (#292) + * More verbosity in case VDSO magic mismatch + * Restore or legacy epoll target descriptors and fsnotify marks is + unified with common case + Bugfixes: + * Restoring fanotify marks from old images (<1.3) dropped the mark + * Binfmt_misc mount could be mounted into wrong place + * Compilation failed with gcc 6.3.0 (#315) + * Waiting helpers could race with sigchild handler and would result + in restore failure + * Missing VVAR page in 32bit tasks wasn't skipped and resulted in + restore failure + * After restore consumption of files is increased (was fixed as + side effect of mmap optimization) + Deprecation/Removal: + * Deprecated separate images for fsnotify marks + +- Fix the installation of python stuff: + criu-py-install-fix.diff +- Fix the build for ppc64: + criu-correct-ppc64-AT_VECTOR_SIZE_ARCH.patch + ------------------------------------------------------------------- Mon Apr 24 22:31:21 CEST 2017 - tiwai@suse.de diff --git a/criu.spec b/criu.spec index 9cf5929..0763656 100644 --- a/criu.spec +++ b/criu.spec @@ -17,13 +17,15 @@ Name: criu -Version: 3.0 +Version: 3.2 Release: 0 Summary: Checkpoint/Restore In Userspace Tools License: GPL-2.0 Group: System/Console Url: http://criu.org/ Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2 +Patch1: criu-py-install-fix.diff +Patch2: criu-correct-ppc64-AT_VECTOR_SIZE_ARCH.patch BuildRequires: asciidoc %if 0%{suse_version} > 1320 BuildRequires: libbsd-devel @@ -78,6 +80,8 @@ to develop applications with CRIU library. %prep %setup -q +%patch1 -p1 +%patch2 -p1 # default off echo "BINFMT_MISC_VIRTUALIZED" > .config