File criu-py-install-fix.diff of Package criu

Overview Repositories Revisions Requests Users Attributes Meta

File criu-py-install-fix.diff of Package criu (Revision 1f7450361fe46c80ac1fb41e074e6fe8)

Currently displaying revision 1f7450361fe46c80ac1fb41e074e6fe8 , Show latest

---
 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=[],
+)

Places

File criu-py-install-fix.diff of Package criu (Revision 1f7450361fe46c80ac1fb41e074e6fe8)

Places