diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-10 22:35:31 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-10 22:35:31 -0400 |
| commit | 8d40af1278ead368afe14bce8713145730b453a2 (patch) | |
| tree | 336d3aff8f0e3ac60115cccea1303c25198a4d96 /recipes-containers/criu/files | |
| parent | a5343f76b4afac7ceaa329d9dd91dc7ffb75c6be (diff) | |
| download | meta-virtualization-8d40af1278ead368afe14bce8713145730b453a2.tar.gz | |
Revert "criu: Correct the installation directory for python modules"
This reverts commit 90c1046b58c50f127ea711d83874a1dc4b68f7ed.
Diffstat (limited to 'recipes-containers/criu/files')
| -rw-r--r-- | recipes-containers/criu/files/0001-criu-Correct-the-installation-directory-for-python-m.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-containers/criu/files/0001-criu-Correct-the-installation-directory-for-python-m.patch b/recipes-containers/criu/files/0001-criu-Correct-the-installation-directory-for-python-m.patch deleted file mode 100644 index 0439b3c4..00000000 --- a/recipes-containers/criu/files/0001-criu-Correct-the-installation-directory-for-python-m.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 29865b7e9288a60aca151df323ee89c0952e8158 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> | ||
| 3 | Date: Thu, 3 Nov 2016 01:33:57 -0400 | ||
| 4 | Subject: [PATCH] criu: Correct the installation directory for python module | ||
| 5 | distributions | ||
| 6 | |||
| 7 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | ||
| 8 | --- | ||
| 9 | lib/Makefile | 4 ++-- | ||
| 10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/lib/Makefile b/lib/Makefile | ||
| 13 | index f1c0821..c3003a5 100644 | ||
| 14 | --- a/lib/Makefile | ||
| 15 | +++ b/lib/Makefile | ||
| 16 | @@ -55,8 +55,8 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in | ||
| 17 | $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig | ||
| 18 | $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc | ||
| 19 | $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig | ||
| 20 | - $(E) " INSTALL " crit | ||
| 21 | - $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) | ||
| 22 | + $(E) " INSTALL " crit | ||
| 23 | + $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-lib=$(PYTHON_SITEPACKAGES_DIR) --record $(CRIT_SETUP_FILES) | ||
| 24 | .PHONY: install | ||
| 25 | |||
| 26 | uninstall: | ||
| 27 | -- | ||
| 28 | 2.8.1 | ||
| 29 | |||
