From 3e709e6665ba89f5875584de259e1689728cf83b Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 13 Apr 2018 10:50:08 +0800 Subject: criu: fix build failure with newer glibc and kernel With newer glibc(>= 2.26) and kernel(>=4.14), criu would fail to build: In file included from /buildarea/build/tmp/work/core2-64-poky-linux/criu/3.4+gitAUTOINC+a31c1854e1-r0/recipe-sysroot/usr/include/linux/aio_abi.h:31:0, from criu/cr-check.c:24: /buildarea/build/tmp/work/core2-64-poky-linux/criu/3.4+gitAUTOINC+a31c1854e1-r0/recipe-sysroot/usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant MS_RDONLY = 1, /* Mount read-only. */ ^ CC criu/parasite-syscall.o CC criu/pipes.o CC criu/pie-util.o CC criu/pie-util-vdso.o CC criu/plugin.o /buildarea/build/tmp/work/core2-64-poky-linux/criu/3.4+gitAUTOINC+a31c1854e1-r0/git/scripts/nmk/scripts/build.mk:110: recipe for target 'criu/cr-check.o' failed make[2]: *** [criu/cr-check.o] Error 1 Backport a patch to fix it. Signed-off-by: Yi Zhao Signed-off-by: Bruce Ashfield --- .../fix-building-on-newest-glibc-and-kernel.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch (limited to 'recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch') diff --git a/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch b/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch new file mode 100644 index 00000000..d6341da7 --- /dev/null +++ b/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch @@ -0,0 +1,47 @@ +From f41e386d4d40e3e26b0cfdc85a812b7edb337f1d Mon Sep 17 00:00:00 2001 +From: Adrian Reber +Date: Thu, 28 Sep 2017 09:13:33 +0000 +Subject: [PATCH] fix building on newest glibc and kernel + +On Fedora rawhide with kernel-headers-4.14.0-0.rc2.git0.1.fc28.x86_64 +glibc-devel-2.26.90-15.fc28.x86_64 criu does not build any more: + +In file included from /usr/include/linux/aio_abi.h:31:0, + from criu/cr-check.c:24: +/usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant + MS_RDONLY = 1, /* Mount read-only. */ + ^ +make[2]: *** [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1 +make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2 +make: *** [Makefile:233: criu] Error 2 + +This simple re-ordering of includes fixes it for me. + +Signed-off-by: Adrian Reber +Signed-off-by: Andrei Vagin + +Upstream-Status: Backport +[https://github.com/checkpoint-restore/criu/commit/f41e386d4d40e3e26b0cfdc85a812b7edb337f1d#diff-cc847b1cc975358c6582595be92d48db] + +Signed-off-by: Yi Zhao +--- + criu/cr-check.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/criu/cr-check.c b/criu/cr-check.c +index 5dd448b..8986ec4 100644 +--- a/criu/cr-check.c ++++ b/criu/cr-check.c +@@ -21,8 +21,8 @@ + #include + #include + #include +-#include + #include ++#include + + #include "../soccr/soccr.h" + +-- +2.7.4 + -- cgit v1.2.3-54-g00ecf