3 files changed, 3 insertions, 194 deletions

diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 24aa3012..febf81ed 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -13,15 +13,13 @@ EXCLUDE_FROM_WORLD = "1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
 
-SRCREV = "c703e3fd8404e506cc6156719b953ea0580d59a4"
-PV = "3.13+git${SRCPV}"
+SRCREV = "e49ce513c8df43e8d3b30b7acfbe7bd496d89862"
+PV = "3.14+git${SRCPV}"
 
-SRC_URI = "git://github.com/checkpoint-restore/criu.git \
-           file://0001-criu-Fix-toolchain-hardcode.patch \
+SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=criu-dev \
            file://0002-criu-Skip-documentation-install.patch \
            file://0001-criu-Change-libraries-install-directory.patch \
            file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \
-           file://0001-criu-fix-build-failure-against-gcc-10.patch \
           "
 
 COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
diff --git a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
deleted file mode 100644
index bd7a6c57..00000000
--- a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c005b7a4874f55df687ff22bc425551775581421 Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Fri, 8 Sep 2017 15:02:14 -0400
-Subject: [PATCH] criu: Fix toolchain hardcode
-
-Replace ":=" to "?=" so that the toolchain used by bitbake build system will
-be taken.
-
-Signed-off-by: Yang Shi <yang.shi@windriver.com>
-Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
-
----
- Makefile                       |  2 +-
- scripts/nmk/scripts/include.mk |  2 +-
- scripts/nmk/scripts/tools.mk   | 40 ++++++++++++++++++++--------------------
- 3 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f2583a2..d7f51e5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@ ifeq ($(origin HOSTCFLAGS), undefined)
-         HOSTCFLAGS := $(CFLAGS) $(USERCFLAGS)
- endif
- 
--UNAME-M := $(shell uname -m)
-+UNAME-M ?= $(shell uname -m)
- 
- #
- # Supported Architectures
-diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
-index 04ccb3a..0d63bc7 100644
---- a/scripts/nmk/scripts/include.mk
-+++ b/scripts/nmk/scripts/include.mk
-@@ -22,7 +22,7 @@ SUBARCH := $(shell uname -m | sed       \
-                 -e s/aarch64.*/aarch64/)
- 
- ARCH           ?= $(SUBARCH)
--SRCARCH        := $(ARCH)
-+SRCARCH        ?= $(ARCH)
- 
- export SUBARCH ARCH SRCARCH
- 
-diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
-index 56dba84..1698821 100644
---- a/scripts/nmk/scripts/tools.mk
-+++ b/scripts/nmk/scripts/tools.mk
-@@ -2,35 +2,35 @@ ifndef ____nmk_defined__tools
- 
- #
- # System tools shorthands
--RM             := rm -f
-+RM             ?= rm -f
- HOSTLD         ?= ld
- ifeq ($(origin LD), default)
- LD             := $(CROSS_COMPILE)$(HOSTLD)
- endif
- HOSTCC         ?= gcc
- ifeq ($(origin CC), default)
- CC             := $(CROSS_COMPILE)$(HOSTCC)
- endif
--CPP            := $(CC) -E
--AS             := $(CROSS_COMPILE)as
--AR             := $(CROSS_COMPILE)ar
--STRIP          := $(CROSS_COMPILE)strip
--OBJCOPY                := $(CROSS_COMPILE)objcopy
--OBJDUMP                := $(CROSS_COMPILE)objdump
--NM             := $(CROSS_COMPILE)nm
--MAKE           := make
--MKDIR          := mkdir -p
--AWK            := awk
--PERL           := perl
--FULL_PYTHON    := $(shell which python2 2>/dev/null || which python3 2>/dev/null)
-+CPP            ?= $(CC) -E
-+AS             ?= $(CROSS_COMPILE)as
-+AR             ?= $(CROSS_COMPILE)ar
-+STRIP          ?= $(CROSS_COMPILE)strip
-+OBJCOPY                ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP                ?= $(CROSS_COMPILE)objdump
-+NM             ?= $(CROSS_COMPILE)nm
-+MAKE           ?= make
-+MKDIR          ?= mkdir -p
-+AWK            ?= awk
-+PERL           ?= perl
-+FULL_PYTHON    ?= $(shell which python2 2>/dev/null || which python3 2>/dev/null)
- PYTHON         ?= $(shell basename $(FULL_PYTHON))
--FIND           := find
--SH             := $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
-+FIND           ?= find
-+SH             ?= $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
-                         else if [ -x /bin/bash ]; then echo /bin/bash;  \
-                         else echo sh; fi ; fi)
--CSCOPE         := cscope
--ETAGS          := etags
--CTAGS          := ctags
-+CSCOPE         ?= cscope
-+ETAGS          ?= etags
-+CTAGS          ?= ctags
- 
- export RM HOSTLD LD HOSTCC CC CPP AS AR STRIP OBJCOPY OBJDUMP
- export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE
diff --git a/recipes-containers/criu/files/0001-criu-fix-build-failure-against-gcc-10.patch b/recipes-containers/criu/files/0001-criu-fix-build-failure-against-gcc-10.patch
deleted file mode 100644
index f1a2561f..00000000
--- a/recipes-containers/criu/files/0001-criu-fix-build-failure-against-gcc-10.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From c6b9c083ecbd2060c7dc77a9264ef10aafa19063 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 2 Feb 2020 18:45:59 +0000
-Subject: [PATCH] criu: fix build failure against gcc-10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159:
-  multiple definition of `rpc_cfg_file'; criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here
-make[2]: *** [scripts/nmk/scripts/build.mk:164: criu/arch/x86/crtools.built-in.o] Error 1
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Toralf Förster
-Bug: https://bugs.gentoo.org/707942
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-Upstream-Status: Backport [https://github.com/checkpoint-restore/criu/pull/936]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-
----
- criu/config.c             | 1 +
- criu/include/cr_options.h | 2 +-
- criu/include/pstree.h     | 2 +-
- criu/include/tun.h        | 2 +-
- 4 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/criu/config.c b/criu/config.c
-index 39aa071c..009a48a6 100644
---- a/criu/config.c
-+++ b/criu/config.c
-@@ -30,6 +30,7 @@
- #include "common/xmalloc.h"
- 
- struct cr_options opts;
-+char *rpc_cfg_file;
- 
- static int count_elements(char **to_count)
- {
-diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
-index 82f76ad9..9c20aaea 100644
---- a/criu/include/cr_options.h
-+++ b/criu/include/cr_options.h
-@@ -147,7 +147,7 @@ struct cr_options {
- };
- 
- extern struct cr_options opts;
--char *rpc_cfg_file;
-+extern char *rpc_cfg_file;
- 
- extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state);
- extern int check_options();
-diff --git a/criu/include/pstree.h b/criu/include/pstree.h
-index 7303c1fe..61ab0ce0 100644
---- a/criu/include/pstree.h
-+++ b/criu/include/pstree.h
-@@ -42,7 +42,7 @@ enum {
- };
- #define FDS_EVENT (1 << FDS_EVENT_BIT)
- 
--struct pstree_item *current;
-+extern struct pstree_item *current;
- 
- struct rst_info;
- /* See alloc_pstree_item() for details */
-diff --git a/criu/include/tun.h b/criu/include/tun.h
-index ce0b266a..b82c445a 100644
---- a/criu/include/tun.h
-+++ b/criu/include/tun.h
-@@ -5,7 +5,7 @@
- #define TUN_MINOR      200
- #endif
- 
--struct ns_id *ns;
-+extern struct ns_id *ns;
- 
- #include <linux/netlink.h>
-