basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

1 files changed, 18 insertions, 9 deletions

diff --git a/external/meta-virtualization/recipes-containers/criu/criu_git.bb b/external/meta-virtualization/recipes-containers/criu/criu_git.bb
index 00de417b..704a0f9e 100644
--- a/external/meta-virtualization/recipes-containers/criu/criu_git.bb
+++ b/external/meta-virtualization/recipes-containers/criu/criu_git.bb
@@ -13,10 +13,10 @@ EXCLUDE_FROM_WORLD = "1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
 
-SRCREV = "c49eab368a68682475c4e693258246e04232e6d2"
-PV = "3.10+git${SRCPV}"
+SRCREV = "c703e3fd8404e506cc6156719b953ea0580d59a4"
+PV = "3.13+git${SRCPV}"
 
-SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
+SRC_URI = "git://github.com/checkpoint-restore/criu.git \
            file://0001-criu-Fix-toolchain-hardcode.patch \
            file://0002-criu-Skip-documentation-install.patch \
            file://0001-criu-Change-libraries-install-directory.patch \
@@ -37,7 +37,7 @@ S = "${WORKDIR}/git"
 #
 EXTRA_OEMAKE_arm += "ARCH=arm UNAME-M=${CRIU_BUILD_ARCH} WERROR=0"
 EXTRA_OEMAKE_x86-64 += "ARCH=x86 WERROR=0"
-EXTRA_OEMAKE_aarch64 += "ARCH=arm64 WERROR=0"
+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}"
@@ -53,8 +53,11 @@ export C_INCLUDE_PATH="${STAGING_INCDIR}/libnl3"
 
 export BUILD_SYS
 export HOST_SYS
+export HOSTCFLAGS = "${BUILD_CFLAGS}"
 
-inherit setuptools
+inherit setuptools3
+
+B = "${S}"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[selinux] = ",,libselinux"
@@ -67,18 +70,24 @@ do_compile_prepend() {
 }
 
 do_compile () {
-	oe_runmake FULL_PYTHON=${PYTHON} PYTHON=python2
+	oe_runmake FULL_PYTHON=${PYTHON} PYTHON=python3
 }
 
 do_install () {
     export INSTALL_LIB="${libdir}/${PYTHON_DIR}/site-packages"
-    oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" FULL_PYTHON=${PYTHON} PYTHON=python2 install
+    oe_runmake PREFIX=${exec_prefix} LIBDIR=${libdir} DESTDIR="${D}" FULL_PYTHON=${PYTHON} PYTHON=python3 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%g' ${D}/usr/bin/crit
 }
 
 FILES_${PN} += "${systemd_unitdir}/ \
-            ${libdir}/python2.7/site-packages/ \
+            ${libdir}/python3*/site-packages/ \
             ${libdir}/pycriu/ \
-            ${libdir}/crit-0.0.1-py2.7.egg-info \
+            ${libdir}/crit-0.0.1-py3*.egg-info \
             "
 
 FILES_${PN}-staticdev += " \