Takashi Iwai
babf377fa1
New features:
* Shadow stack support
* CUDA plugin: Introduced a plugin to support checkpointing and restoring
NVIDIA CUDA applications.
Bugfixes:
* cgroup: Add support for restoring a thread in a correct v1 cgroup
* mem: fix some VMAs being incorrectly mapped wtih PROT_WRITE
* criu: fix a fatal failure if nft doesn't work
* net: Fix TOCTOU race condition in unix_conf_op
* pagemap-cache: handle short reads
* Fixes here and there.
Improvements:
* Pagemap cache: Added support for PAGEMAP_SCAN ioctl
* zdtm: Added tests for IP_TTL restore
* irmap: hardcode some more interesting paths
* util: use close_range when it's supported
* Fixes and improvements in amdgpu-plugin
- Make criu-plugin-cuda subpackage
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=121
102 lines
3.0 KiB
Diff
102 lines
3.0 KiB
Diff
---
|
|
crit/Makefile | 6 +-----
|
|
lib/Makefile | 6 +-----
|
|
scripts/crit-setup.py | 28 ++++++++++++++++++++++++++++
|
|
scripts/pycriu-setup.py | 28 ++++++++++++++++++++++++++++
|
|
4 files changed, 58 insertions(+), 10 deletions(-)
|
|
|
|
--- a/crit/Makefile
|
|
+++ b/crit/Makefile
|
|
@@ -7,12 +7,8 @@ ${VERSION_FILE}:
|
|
$(Q) echo "__version__ = '${CRIU_VERSION}'" > $@
|
|
|
|
install: ${VERSION_FILE}
|
|
-ifeq ($(SKIP_PIP_INSTALL),0)
|
|
$(E) " INSTALL " crit
|
|
- $(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./crit
|
|
-else
|
|
- $(E) " SKIP INSTALL crit"
|
|
-endif
|
|
+ $(Q) $(PYTHON) scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
|
|
.PHONY: install
|
|
|
|
uninstall:
|
|
--- a/lib/Makefile
|
|
+++ b/lib/Makefile
|
|
@@ -54,12 +54,8 @@ install: lib-c lib-a lib-py lib/c/criu.p
|
|
$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
|
|
$(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
|
|
-ifeq ($(SKIP_PIP_INSTALL),0)
|
|
$(E) " INSTALL " pycriu
|
|
- $(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./lib
|
|
-else
|
|
- $(E) " SKIP INSTALL pycriu"
|
|
-endif
|
|
+ $(Q) $(PYTHON) scripts/pycriu-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
|
|
.PHONY: install
|
|
|
|
uninstall:
|
|
--- /dev/null
|
|
+++ b/scripts/crit-setup.py
|
|
@@ -0,0 +1,28 @@
|
|
+import os
|
|
+from distutils.core import setup
|
|
+
|
|
+def get_version():
|
|
+ version = '0.0.1'
|
|
+ env = os.environ
|
|
+ if 'CRIU_VERSION_MAJOR' in env and 'CRIU_VERSION_MINOR' in env:
|
|
+ version = '{}.{}'.format(
|
|
+ env['CRIU_VERSION_MAJOR'],
|
|
+ env['CRIU_VERSION_MINOR']
|
|
+ )
|
|
+ if 'CRIU_VERSION_SUBLEVEL' in env and env['CRIU_VERSION_SUBLEVEL']:
|
|
+ version += '.' + env['CRIU_VERSION_SUBLEVEL']
|
|
+ return version
|
|
+
|
|
+
|
|
+setup(
|
|
+ name='crit',
|
|
+ version=get_version(),
|
|
+ description='CRiu Image Tool',
|
|
+ author='CRIU team',
|
|
+ author_email='criu@openvz.org',
|
|
+ license='GPLv2',
|
|
+ url='https://github.com/checkpoint-restore/criu',
|
|
+ package_dir={'crit': 'crit/crit'},
|
|
+ packages=["crit"],
|
|
+ install_requires=[],
|
|
+)
|
|
--- /dev/null
|
|
+++ b/scripts/pycriu-setup.py
|
|
@@ -0,0 +1,28 @@
|
|
+import os
|
|
+from distutils.core import setup
|
|
+
|
|
+def get_version():
|
|
+ version = '0.0.1'
|
|
+ env = os.environ
|
|
+ if 'CRIU_VERSION_MAJOR' in env and 'CRIU_VERSION_MINOR' in env:
|
|
+ version = '{}.{}'.format(
|
|
+ env['CRIU_VERSION_MAJOR'],
|
|
+ env['CRIU_VERSION_MINOR']
|
|
+ )
|
|
+ if 'CRIU_VERSION_SUBLEVEL' in env and env['CRIU_VERSION_SUBLEVEL']:
|
|
+ version += '.' + env['CRIU_VERSION_SUBLEVEL']
|
|
+ return version
|
|
+
|
|
+
|
|
+setup(
|
|
+ name='pycriu',
|
|
+ version=get_version(),
|
|
+ description='CRiu Image Tool',
|
|
+ author='CRIU team',
|
|
+ author_email='criu@openvz.org',
|
|
+ license='GPLv2',
|
|
+ url='https://github.com/checkpoint-restore/criu',
|
|
+ package_dir={'pycriu': 'lib/pycriu'},
|
|
+ packages=["pycriu", "pycriu.images"],
|
|
+ install_requires=[],
|
|
+)
|