2 files changed, 38 insertions, 8 deletions

diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index bcb0ddb6..c27ca56e 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -13,8 +13,8 @@ EXCLUDE_FROM_WORLD = "1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
 
-SRCREV = "a44aa6d985472d995d04fef7eae22d63c7500f8c"
-PV = "4.1.1+git"
+SRCREV = "3c7d4fa013297b431da48eff821db7f2e8b90c27"
+PV = "4.2+git"
 
 SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \
            file://0001-criu-Skip-documentation-install.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 "
@@ -69,11 +70,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
diff --git a/recipes-containers/criu/files/0006-images-Makefile-fix-cross-compilation-protobuf-paths.patch b/recipes-containers/criu/files/0006-images-Makefile-fix-cross-compilation-protobuf-paths.patch
new file mode 100644
index 00000000..da3eced3
--- /dev/null
+++ b/recipes-containers/criu/files/0006-images-Makefile-fix-cross-compilation-protobuf-paths.patch
@@ -0,0 +1,34 @@
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Subject: [PATCH] images/Makefile: fix cross-compilation protobuf paths
+
+pkg-config --variable=includedir returns the host path (e.g.
+/usr/include) without applying PKG_CONFIG_SYSROOT_DIR, since sysroot
+prefixing only applies to -I flags from --cflags, not raw --variable
+queries. The protoc --proto_path was also hardcoded to /usr/include.
+
+Make the include dir overridable via PROTOBUF_INCLUDEDIR so cross-build
+systems can pass the correct sysroot path through EXTRA_OEMAKE.
+
+Upstream-Status: Pending
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ images/Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/images/Makefile b/images/Makefile
+--- a/images/Makefile
++++ b/images/Makefile
+@@ -93,10 +93,11 @@ makefile-deps := Makefile $(obj)/Makefile
+ #
+ # Generate descriptor.pb-c.c and descriptor.pb-c.h to compile opts.proto.
+ DESCRIPTOR_DIR := images/google/protobuf
+-GOOGLE_INCLUDE=$(shell pkg-config protobuf --variable=includedir)/google/protobuf
++PROTOBUF_INCLUDEDIR ?= $(shell pkg-config protobuf --variable=includedir)
++GOOGLE_INCLUDE=$(PROTOBUF_INCLUDEDIR)/google/protobuf
+ $(DESCRIPTOR_DIR)/descriptor.pb-c.c: $(GOOGLE_INCLUDE)/descriptor.proto
+        $(call msg-gen, $@)
+-       $(Q) protoc --proto_path=/usr/include --proto_path=$(obj)/ --c_out=$(obj)/ $<
++       $(Q) protoc --proto_path=$(PROTOBUF_INCLUDEDIR) --proto_path=$(obj)/ --c_out=$(obj)/ $<
+ 
+ cleanup-y += $(DESCRIPTOR_DIR)/descriptor.pb-c.d