1 files changed, 33 insertions, 11 deletions

diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 7cadda24..c4539e34 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -19,11 +19,12 @@ PV = "3.19.0+git"
 SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \
            file://0001-criu-Skip-documentation-install.patch \
            file://0002-criu-Change-libraries-install-directory.patch \
+           file://0003-crit-pycriu-build-and-install-wheels.patch \
            "
 
 COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
 
-DEPENDS += "libnl libcap protobuf-c-native protobuf-c util-linux-native libbsd libnet python3-pip-native"
+DEPENDS += "libnl libcap protobuf-c-native protobuf-c util-linux-native libbsd libnet"
 RDEPENDS:${PN} = "bash cgroup-lite"
 
 S = "${WORKDIR}/git"
@@ -40,7 +41,7 @@ EXTRA_OEMAKE:aarch64 += "ARCH=aarch64 WERROR=0"
 EXTRA_OEMAKE:append = " SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no"
 EXTRA_OEMAKE:append = " LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_unitdir}"
 
-CFLAGS += "-D__USE_GNU -D_GNU_SOURCE " 
+CFLAGS += "-D__USE_GNU -D_GNU_SOURCE "
 
 CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3"
 CFLAGS:arm += "-D__WORDSIZE"
@@ -53,7 +54,8 @@ export BUILD_SYS
 export HOST_SYS
 export HOSTCFLAGS = "${BUILD_CFLAGS}"
 
-inherit setuptools3
+inherit python_setuptools_build_meta
+#inherit setuptools3
 inherit pkgconfig
 
 B = "${S}"
@@ -71,27 +73,47 @@ do_compile:prepend() {
     ln -s  ${PKG_CONFIG_SYSROOT_DIR}/usr/include/google/protobuf/descriptor.proto ${S}/images/google/protobuf/descriptor.proto
 }
 
+#PEP517_SOURCE_PATH ="${S}/lib"
+
+#do_compile[network] = "1"
+
 do_compile () {
-        oe_runmake FULL_PYTHON=${PYTHON} PYTHON=python3
+        #python_pep517_do_compile
+        #export PEP517_SOURCE_PATH="${S}/crit"
+        #python_pep517_do_compile
+        #oe_runmake
+        #oe_runmake #PIP_BREAK_SYSTEM_PACKAGES=1
+        export PEP517_WHEEL_PATH="${PEP517_WHEEL_PATH}"
+        oe_runmake FULL_PYTHON=${PYTHON} PYTHON=nativepython3
 }
 
+#do_install[network] = "1"
+
 do_install () {
     export INSTALL_LIB="${libdir}/${PYTHON_DIR}/site-packages"
-    oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" PLUGINDIR="${localstatedir}/lib" FULL_PYTHON=${PYTHON} PYTHON=python3 install
+    export PEP517_WHEEL_PATH="${PEP517_WHEEL_PATH}"
+    #oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" PLUGINDIR="${localstatedir}/lib" PIP_BREAK_SYSTEM_PACKAGES=1 install
+    oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" PLUGINDIR="${localstatedir}/lib" FULL_PYTHON=${PYTHON} PYTHON=nativepython3 install
 
     # python3's distutils has a feature of rewriting the interpeter on setup installed
     # scripts. 'crit' is one of those scripts. The "executable" or "e" option to the
     # setup call should fix it, but it is being ignored. So to avoid getting our native
     # intepreter replaced in the script, we'll do an explicit update ourselves.
-    sed -i 's%^\#\!.*%\#\!/usr/bin/env python3%' ${D}/usr/bin/crit ${D}${libdir}/python3*/site-packages/crit-*-py3*.egg/EGG-INFO/scripts/crit
-
-    rm -rf ${D}/__pycache__
+    #
+    # we're building wheels now, so EGG-INFO need not apply
+    #sed -i 's%^\#\!.*%\#\!/usr/bin/env python3%' ${D}/usr/bin/crit ${D}${libdir}/python3*/site-packages/crit-*-py3*.egg/EGG-INFO/scripts/crit
+
+    # all the __pycache__ contains references to TMPDIR and these will be built the first time
+    # it runs on the target anyway
+    for pycachedir in $(find ${D} -name __pycache__); do
+        rm -rf $pycachedir
+    done
 }
 
 FILES:${PN} += "${systemd_unitdir}/ \
-            ${libdir}/python3*/site-packages/ \
-            ${libdir}/pycriu/ \
-            ${libdir}/crit-0.0.1-py3*.egg-info \
+            #${libdir}/python3*/site-packages/ \
+            #${libdir}/pycriu/ \
+            #${libdir}/crit-0.0.1-py3*.egg-info \
             "
 
 FILES:${PN}-staticdev += " \