criu: upgrade from version from 1.2 to 1.4

Upgrade criu from version from 1.2 to 1.4.
criu is the only user of protobuf and only supported on x86 and arm,
so limit protobuf support on x86 and arm too.

Signed-off-by: Nam Ninh <nam.ninh@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 75 insertions, 47 deletions

diff --git a/recipes-containers/criu/files/0001-Fixed-hardcoding.patch b/recipes-containers/criu/files/0001-Fixed-hardcoding.patch
deleted file mode 100644
index 5ff0a78d..00000000
--- a/recipes-containers/criu/files/0001-Fixed-hardcoding.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 32c6c037a6de0a0972e16949ebb64ffebb5b7bcc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Nystr=C3=B6m?= <david.nystrom@enea.com>
-Date: Wed, 28 Nov 2012 15:07:27 +0100
-Subject: [PATCH] Fixed hardcoding
-
----
- Makefile.inc |   24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/Makefile.inc b/Makefile.inc
-index 722cbfc..3ae693e 100644
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -11,18 +11,18 @@ else
- endif
- export E Q
- 
--FIND           := find
--CSCOPE         := cscope
--TAGS           := ctags
--RM             := rm
--LD             := ld
--HEXDUMP                := hexdump
--CC             := gcc
--ECHO           := echo
--NM             := nm
--AWK            := awk
--SH             := sh
--MAKE           := make
-+FIND           ?= find
-+CSCOPE         ?= cscope
-+TAGS           ?= ctags
-+RM             ?= rm
-+LD             ?= ld
-+HEXDUMP                ?= hexdump
-+CC             ?= gcc
-+ECHO           ?= echo
-+NM             ?= nm
-+AWK            ?= awk
-+SH             ?= sh
-+MAKE           ?= make
- 
- # Additional ARCH settings for x86
- ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
--- 
-1.7.9.5
-
diff --git a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
new file mode 100644
index 00000000..2fabe0ad
--- /dev/null
+++ b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
@@ -0,0 +1,46 @@
+From 3d4f112fdb434712eba09239a468842323f1af4c Mon Sep 17 00:00:00 2001
+From: Yang Shi <yang.shi@windriver.com>
+Date: Tue, 26 Aug 2014 14:42:42 -0700
+Subject: [PATCH 1/2] 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: Nam Ninh <nam.ninh@windriver.com>
+---
+ Makefile | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f1c8784..43252ec 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,15 +23,15 @@ export VERSION_SO_MAJOR VERSION_SO_MINOR
+ # Common definitions
+ #
+ 
+-FIND           := find
+-CSCOPE         := cscope
+-RM             := rm -f
+-LD             := $(CROSS_COMPILE)ld
+-CC             := $(CROSS_COMPILE)gcc
+-NM             := $(CROSS_COMPILE)nm
+-SH             := bash
+-MAKE           := make
+-OBJCOPY                := $(CROSS_COMPILE)objcopy
++FIND           ?= find
++CSCOPE         ?= cscope
++RM             ?= rm -f
++LD             ?= $(CROSS_COMPILE)ld
++CC             ?= $(CROSS_COMPILE)gcc
++NM             ?= $(CROSS_COMPILE)nm
++SH             ?= bash
++MAKE           ?= make
++OBJCOPY                ?= $(CROSS_COMPILE)objcopy
+ 
+ CFLAGS         += $(USERCFLAGS)
+ 
+-- 
+2.0.2
+
diff --git a/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch b/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch
new file mode 100644
index 00000000..eaf81603
--- /dev/null
+++ b/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch
@@ -0,0 +1,29 @@
+From e9c2a94b9eb37ad24672b10caa398bd18282b962 Mon Sep 17 00:00:00 2001
+From: Yang Shi <yang.shi@windriver.com>
+Date: Tue, 26 Aug 2014 14:44:51 -0700
+Subject: [PATCH 2/2] criu: Skip documentation install
+
+asciidoc is needed to generate CRIU documentation, so skip it in install.
+
+Signed-off-by: Yang Shi <yang.shi@windriver.com>
+Signed-off-by: Nam Ninh <nam.ninh@windriver.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 43252ec..e25edcc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -265,7 +265,7 @@ install: $(PROGRAM) install-man
+        $(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR)
+ 
+ install-man:
+-       $(Q) $(MAKE) -C Documentation install
++#      $(Q) $(MAKE) -C Documentation install
+ 
+ .PHONY: install install-man
+ 
+-- 
+2.0.2
+