diff options
author | Nam Ninh <nam.ninh@windriver.com> | 2015-03-30 18:10:53 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-03-30 23:45:22 -0400 |
commit | 9a095cb70e8f221619dbab50be0d27e8ed55b8b0 (patch) | |
tree | 77dd7850f6369a35d77b1455921452eb4e9642d1 /recipes-containers/criu/files/0001-Fixed-hardcoding.patch | |
parent | aafab33979dede1fa5afef80b96401a3dafc2419 (diff) | |
download | meta-virtualization-9a095cb70e8f221619dbab50be0d27e8ed55b8b0.tar.gz |
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>
Diffstat (limited to 'recipes-containers/criu/files/0001-Fixed-hardcoding.patch')
-rw-r--r-- | recipes-containers/criu/files/0001-Fixed-hardcoding.patch | 47 |
1 files changed, 0 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 @@ | |||
1 | From 32c6c037a6de0a0972e16949ebb64ffebb5b7bcc Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?David=20Nystr=C3=B6m?= <david.nystrom@enea.com> | ||
3 | Date: Wed, 28 Nov 2012 15:07:27 +0100 | ||
4 | Subject: [PATCH] Fixed hardcoding | ||
5 | |||
6 | --- | ||
7 | Makefile.inc | 24 ++++++++++++------------ | ||
8 | 1 file changed, 12 insertions(+), 12 deletions(-) | ||
9 | |||
10 | diff --git a/Makefile.inc b/Makefile.inc | ||
11 | index 722cbfc..3ae693e 100644 | ||
12 | --- a/Makefile.inc | ||
13 | +++ b/Makefile.inc | ||
14 | @@ -11,18 +11,18 @@ else | ||
15 | endif | ||
16 | export E Q | ||
17 | |||
18 | -FIND := find | ||
19 | -CSCOPE := cscope | ||
20 | -TAGS := ctags | ||
21 | -RM := rm | ||
22 | -LD := ld | ||
23 | -HEXDUMP := hexdump | ||
24 | -CC := gcc | ||
25 | -ECHO := echo | ||
26 | -NM := nm | ||
27 | -AWK := awk | ||
28 | -SH := sh | ||
29 | -MAKE := make | ||
30 | +FIND ?= find | ||
31 | +CSCOPE ?= cscope | ||
32 | +TAGS ?= ctags | ||
33 | +RM ?= rm | ||
34 | +LD ?= ld | ||
35 | +HEXDUMP ?= hexdump | ||
36 | +CC ?= gcc | ||
37 | +ECHO ?= echo | ||
38 | +NM ?= nm | ||
39 | +AWK ?= awk | ||
40 | +SH ?= sh | ||
41 | +MAKE ?= make | ||
42 | |||
43 | # Additional ARCH settings for x86 | ||
44 | ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | ||
45 | -- | ||
46 | 1.7.9.5 | ||
47 | |||