1 files changed, 11 insertions, 9 deletions

diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index bcb0ddb6..54383144 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -13,10 +13,10 @@ EXCLUDE_FROM_WORLD = "1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
 
-SRCREV = "a44aa6d985472d995d04fef7eae22d63c7500f8c"
-PV = "4.1.1+git"
+SRCREV = "4d76d1acdcd69afcedf1335c810bef5f8e18d95e"
+PV = "4.2+git"
 
-SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=criu-dev;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 \
@@ -24,6 +24,7 @@ SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=h
            file://0005-pycriu-skip-dependency-check-during-build.patch \
            file://0001-crit-explicity-set-PEP517_SOURCE_PATH.patch \
            file://0001-plugins-cuda-pass-DEBUG_PREFIX_MAP.patch \
+           file://0006-images-Makefile-fix-cross-compilation-protobuf-paths.patch \
            "
 
 COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
@@ -40,7 +41,7 @@ EXTRA_OEMAKE:arm += "ARCH=arm UNAME-M=${CRIU_BUILD_ARCH} WERROR=0"
 EXTRA_OEMAKE:x86-64 += "ARCH=x86 WERROR=0"
 EXTRA_OEMAKE:aarch64 += "ARCH=aarch64 WERROR=0"
 
-EXTRA_OEMAKE:append = " SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no"
+EXTRA_OEMAKE:append = " SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no PROTOBUF_INCLUDEDIR=${PKG_CONFIG_SYSROOT_DIR}/usr/include"
 EXTRA_OEMAKE:append = " LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_unitdir}"
 
 CFLAGS += "-D__USE_GNU -D_GNU_SOURCE "
@@ -54,6 +55,10 @@ export C_INCLUDE_PATH = "${STAGING_INCDIR}/libnl3"
 
 export BUILD_SYS
 export HOST_SYS
+# Upstream's scripts/nmk/scripts/tools.mk defaults HOSTCC to 'cc' (changed
+# from 'gcc' in criu commit 36c63ecb5). The native sysroot doesn't provide
+# an unprefixed 'cc', so set HOSTCC explicitly to bitbake's BUILD_CC.
+export HOSTCC = "${BUILD_CC}"
 export HOSTCFLAGS = "${BUILD_CFLAGS}"
 
 inherit python_setuptools_build_meta
@@ -69,11 +74,6 @@ CLEANBROKEN = "1"
 # WARNING: criu-3.17.1 do_package_qa: QA Issue: criu: ELF binary /usr/sbin/criu has relocations in .text [textrel]
 INSANE_SKIP:${PN} += "textrel"
 
-do_compile:prepend() {
-    rm -rf ${S}/images/google/protobuf/descriptor.proto
-    ln -s  ${PKG_CONFIG_SYSROOT_DIR}/usr/include/google/protobuf/descriptor.proto ${S}/images/google/protobuf/descriptor.proto
-}
-
 do_compile () {
         export DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"
         oe_runmake FULL_PYTHON=${PYTHON} PYTHON=nativepython3
@@ -112,3 +112,5 @@ FILES:${PN}-staticdev += " \
             ${libexecdir}/compel/std.lib.a \
             ${libexecdir}/compel/fds.lib.a \
             "
+
+CVE_PRODUCT = "criu:checkpoint\/restore_in_userspace"