From 8d40af1278ead368afe14bce8713145730b453a2 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Sun, 10 Sep 2017 22:35:31 -0400
Subject: Revert "criu: Correct the installation directory for python modules"

This reverts commit 90c1046b58c50f127ea711d83874a1dc4b68f7ed.
---
 recipes-containers/criu/criu_git.bb                |  2 --
 ...t-the-installation-directory-for-python-m.patch | 29 ----------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 recipes-containers/criu/files/0001-criu-Correct-the-installation-directory-for-python-m.patch

diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 2df203e2..849a8328 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
            file://0001-criu-Fix-toolchain-hardcode.patch \
            file://0002-criu-Skip-documentation-install.patch \
            file://0001-criu-Change-libraries-install-directory.patch \
-           file://0001-criu-Correct-the-installation-directory-for-python-m.patch \
            ${@bb.utils.contains('PACKAGECONFIG', 'selinux', '', 'file://disable-selinux.patch', d)} \
            file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \
           "
@@ -44,7 +43,6 @@ EXTRA_OEMAKE_aarch64 += "ARCH=arm64 WERROR=0"
 
 EXTRA_OEMAKE_append += "SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no"
 EXTRA_OEMAKE_append += "LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_unitdir}"
-EXTRA_OEMAKE_append += "PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}"
 
 CFLAGS += "-D__USE_GNU -D_GNU_SOURCE " 
 
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 @@
-From 29865b7e9288a60aca151df323ee89c0952e8158 Mon Sep 17 00:00:00 2001
-From: Jianchuan Wang <jianchuan.wang@windriver.com>
-Date: Thu, 3 Nov 2016 01:33:57 -0400
-Subject: [PATCH] criu: Correct the installation directory for python module
- distributions
-
-Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
----
- lib/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index f1c0821..c3003a5 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -55,8 +55,8 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
- 	$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
--	$(E) "  INSTALL " crit
--	$(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
-+	$(E) "  INSTALL " crit 
-+	$(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-lib=$(PYTHON_SITEPACKAGES_DIR) --record $(CRIT_SETUP_FILES)
- .PHONY: install
- 
- uninstall:
--- 
-2.8.1
-
-- 
cgit v1.2.3-54-g00ecf