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/0002-criu-Skip-documentation-install.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/0002-criu-Skip-documentation-install.patch')
-rw-r--r-- | recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch | 29 |
1 files changed, 29 insertions, 0 deletions
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 @@ | |||
1 | From e9c2a94b9eb37ad24672b10caa398bd18282b962 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yang Shi <yang.shi@windriver.com> | ||
3 | Date: Tue, 26 Aug 2014 14:44:51 -0700 | ||
4 | Subject: [PATCH 2/2] criu: Skip documentation install | ||
5 | |||
6 | asciidoc is needed to generate CRIU documentation, so skip it in install. | ||
7 | |||
8 | Signed-off-by: Yang Shi <yang.shi@windriver.com> | ||
9 | Signed-off-by: Nam Ninh <nam.ninh@windriver.com> | ||
10 | --- | ||
11 | Makefile | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index 43252ec..e25edcc 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -265,7 +265,7 @@ install: $(PROGRAM) install-man | ||
19 | $(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR) | ||
20 | |||
21 | install-man: | ||
22 | - $(Q) $(MAKE) -C Documentation install | ||
23 | +# $(Q) $(MAKE) -C Documentation install | ||
24 | |||
25 | .PHONY: install install-man | ||
26 | |||
27 | -- | ||
28 | 2.0.2 | ||
29 | |||