From b95bc0d1eb312720be77f1f019c37cc4e8246277 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 18 Feb 2016 17:58:00 +0300 Subject: [PATCH] build: pycriu -- Move into lib/py As was intended from the scratch. Signed-off-by: Cyrill Gorcunov Acked-by: Tycho Andersen Signed-off-by: Pavel Emelyanov --- lib/Makefile | 4 ++-- lib/{pycriu => py}/.gitignore | 0 lib/{pycriu => py}/Makefile | 0 lib/{pycriu => py}/__init__.py | 0 lib/{pycriu => py}/criu.py | 0 lib/{pycriu => py}/images/.gitignore | 0 lib/{pycriu => py}/images/Makefile | 0 lib/{pycriu => py}/images/__init__.py | 0 lib/{pycriu => py}/images/images.py | 0 lib/{pycriu => py}/images/pb2dict.py | 0 scripts/crit-setup.py | 1 + 11 files changed, 3 insertions(+), 2 deletions(-) rename lib/{pycriu => py}/.gitignore (100%) rename lib/{pycriu => py}/Makefile (100%) rename lib/{pycriu => py}/__init__.py (100%) rename lib/{pycriu => py}/criu.py (100%) rename lib/{pycriu => py}/images/.gitignore (100%) rename lib/{pycriu => py}/images/Makefile (100%) rename lib/{pycriu => py}/images/__init__.py (100%) rename lib/{pycriu => py}/images/images.py (100%) rename lib/{pycriu => py}/images/pb2dict.py (100%) diff --git a/lib/Makefile b/lib/Makefile index df2907ede..1c7847fea 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -22,7 +22,7 @@ PHONY += lib-c # Python bindings. lib-py: $(call msg-gen, $@) - $(Q) $(MAKE) -C pycriu/images all + $(Q) $(MAKE) -C py/images all PHONY += lib-py clean: @@ -31,7 +31,7 @@ clean: $(Q) $(RM) c/$(CRIU_SO) $(Q) $(RM) c/criu.pc $(call msg-clean, lib-py) - $(Q) $(MAKE) -C pycriu/images $@ + $(Q) $(MAKE) -C py/images $@ all: $(PHONY) @true diff --git a/lib/pycriu/.gitignore b/lib/py/.gitignore similarity index 100% rename from lib/pycriu/.gitignore rename to lib/py/.gitignore diff --git a/lib/pycriu/Makefile b/lib/py/Makefile similarity index 100% rename from lib/pycriu/Makefile rename to lib/py/Makefile diff --git a/lib/pycriu/__init__.py b/lib/py/__init__.py similarity index 100% rename from lib/pycriu/__init__.py rename to lib/py/__init__.py diff --git a/lib/pycriu/criu.py b/lib/py/criu.py similarity index 100% rename from lib/pycriu/criu.py rename to lib/py/criu.py diff --git a/lib/pycriu/images/.gitignore b/lib/py/images/.gitignore similarity index 100% rename from lib/pycriu/images/.gitignore rename to lib/py/images/.gitignore diff --git a/lib/pycriu/images/Makefile b/lib/py/images/Makefile similarity index 100% rename from lib/pycriu/images/Makefile rename to lib/py/images/Makefile diff --git a/lib/pycriu/images/__init__.py b/lib/py/images/__init__.py similarity index 100% rename from lib/pycriu/images/__init__.py rename to lib/py/images/__init__.py diff --git a/lib/pycriu/images/images.py b/lib/py/images/images.py similarity index 100% rename from lib/pycriu/images/images.py rename to lib/py/images/images.py diff --git a/lib/pycriu/images/pb2dict.py b/lib/py/images/pb2dict.py similarity index 100% rename from lib/pycriu/images/pb2dict.py rename to lib/py/images/pb2dict.py diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py index 38a71c33a..74368da28 100644 --- a/scripts/crit-setup.py +++ b/scripts/crit-setup.py @@ -6,6 +6,7 @@ setup(name = "crit", author = "CRIU team", author_email = "criu@openvz.org", url = "https://github.com/xemul/criu", + package_dir = {'pycriu': 'py'}, packages = ["pycriu", "pycriu.images"], scripts = ["../crit/crit"] )