<div dir="ltr">merged<div><br></div><div>Bruce</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Aug 30, 2017 at 3:55 AM, <span dir="ltr"><<a href="mailto:jianchuan.wang@windriver.com" target="_blank">jianchuan.wang@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Jianchuan Wang <<a href="mailto:jianchuan.wang@windriver.com">jianchuan.wang@windriver.com</a>><br>
<br>
Signed-off-by: Jianchuan Wang <<a href="mailto:jianchuan.wang@windriver.com">jianchuan.wang@windriver.com</a>><br>
---<br>
 recipes-containers/criu/<a href="http://criu_git.bb" rel="noreferrer" target="_blank">criu_<wbr>git.bb</a>        | 2 ++<br>
 ...t-the-installation-<wbr>directory-for-python-m.patch | 29 ++++++++++++++++++++++<br>
 2 files changed, 31 insertions(+)<br>
 create mode 100644 recipes-containers/criu/files/<wbr>0001-criu-Correct-the-<wbr>installation-directory-for-<wbr>python-m.patch<br>
<br>
diff --git a/recipes-containers/criu/<a href="http://criu_git.bb" rel="noreferrer" target="_blank">criu<wbr>_git.bb</a> b/recipes-containers/criu/<a href="http://criu_git.bb" rel="noreferrer" target="_blank">criu<wbr>_git.bb</a><br>
index 849a832..2df203e 100644<br>
--- a/recipes-containers/criu/<a href="http://criu_git.bb" rel="noreferrer" target="_blank">criu<wbr>_git.bb</a><br>
+++ b/recipes-containers/criu/<a href="http://criu_git.bb" rel="noreferrer" target="_blank">criu<wbr>_git.bb</a><br>
@@ -21,6 +21,7 @@ SRC_URI = "git://<a href="http://github.com/xemul/criu.git;protocol=git" rel="noreferrer" target="_blank">github.com/xemul/criu.<wbr>git;protocol=git</a> \<br>
      file://0001-criu-Fix-<wbr>toolchain-hardcode.patch \<br>
      file://0002-criu-Skip-<wbr>documentation-install.patch \<br>
      file://0001-criu-Change-<wbr>libraries-install-directory.<wbr>patch \<br>
+Â Â Â Â Â Â file://0001-criu-Correct-the-<wbr>installation-directory-for-<wbr>python-m.patch \<br>
      ${@bb.utils.contains('<wbr>PACKAGECONFIG', 'selinux', '', 'file://disable-selinux.patch'<wbr>, d)} \<br>
      file://lib-Makefile-overwrite-<wbr>install-lib-to-allow-multiarc.<wbr>patch \<br>
      "<br>
@@ -43,6 +44,7 @@ EXTRA_OEMAKE_aarch64 += "ARCH=arm64 WERROR=0"<br>
<br>
 EXTRA_OEMAKE_append += "SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no"<br>
 EXTRA_OEMAKE_append += "LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_<wbr>unitdir}"<br>
+EXTRA_OEMAKE_append += "PYTHON_SITEPACKAGES_DIR=${<wbr>PYTHON_SITEPACKAGES_DIR}"<br>
<br>
 CFLAGS += "-D__USE_GNU -D_GNU_SOURCE "<br>
<br>
diff --git a/recipes-containers/criu/<wbr>files/0001-criu-Correct-the-<wbr>installation-directory-for-<wbr>python-m.patch b/recipes-containers/criu/<wbr>files/0001-criu-Correct-the-<wbr>installation-directory-for-<wbr>python-m.patch<br>
new file mode 100644<br>
index 0000000..0439b3c<br>
--- /dev/null<br>
+++ b/recipes-containers/criu/<wbr>files/0001-criu-Correct-the-<wbr>installation-directory-for-<wbr>python-m.patch<br>
@@ -0,0 +1,29 @@<br>
+From 29865b7e9288a60aca151df323ee89<wbr>c0952e8158 Mon Sep 17 00:00:00 2001<br>
+From: Jianchuan Wang <<a href="mailto:jianchuan.wang@windriver.com">jianchuan.wang@windriver.com</a>><br>
+Date: Thu, 3 Nov 2016 01:33:57 -0400<br>
+Subject: [PATCH] criu: Correct the installation directory for python module<br>
+ distributions<br>
+<br>
+Signed-off-by: Jianchuan Wang <<a href="mailto:jianchuan.wang@windriver.com">jianchuan.wang@windriver.com</a>><br>
+---<br>
+ lib/Makefile | 4 ++--<br>
+ 1 file changed, 2 insertions(+), 2 deletions(-)<br>
+<br>
+diff --git a/lib/Makefile b/lib/Makefile<br>
+index f1c0821..c3003a5 100644<br>
+--- a/lib/Makefile<br>
++++ b/lib/Makefile<br>
+@@ -55,8 +55,8 @@ install: lib-c lib-py ../crit/crit c/<a href="http://criu.pc.in" rel="noreferrer" target="_blank">criu.pc.in</a><br>
+Â Â Â Â $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig<br>
+Â Â Â Â $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/<a href="http://criu.pc.in" rel="noreferrer" target="_blank">criu.pc.in</a> > c/criu.pc<br>
+Â Â Â Â $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig<br>
+-Â Â Â $(E) "Â INSTALL " crit<br>
+-Â Â Â $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)<br>
++Â Â Â $(E) "Â INSTALL " crit<br>
++Â Â Â $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-lib=$(PYTHON_<wbr>SITEPACKAGES_DIR) --record $(CRIT_SETUP_FILES)<br>
+ .PHONY: install<br>
+<br>
+ uninstall:<br>
+--<br>
+2.8.1<br>
+<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.7.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
meta-virtualization mailing list<br>
<a href="mailto:meta-virtualization@yoctoproject.org">meta-virtualization@<wbr>yoctoproject.org</a><br>
<a href="https://lists.yoctoproject.org/listinfo/meta-virtualization" rel="noreferrer" target="_blank">https://lists.yoctoproject.<wbr>org/listinfo/meta-<wbr>virtualization</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"</div>
</div>