diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-09-08 17:02:31 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-10 22:36:02 -0400 |
commit | ba35378ce5e24f2bfcb85caa806774b873983d9f (patch) | |
tree | c57c52175acf67f02ffac62234a9c1b3c7927551 /recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | |
parent | 8d40af1278ead368afe14bce8713145730b453a2 (diff) | |
download | meta-virtualization-ba35378ce5e24f2bfcb85caa806774b873983d9f.tar.gz |
criu: uprev to version 3.4
Our current version of criu is about a year old and has some
compilation issues with the latest gcc (currently it is
unbuildable). Since the version of criu and the kernel version are
fairly tightly coupled it wouldn't be surprising of this old criu
would also be exhibiting some runtime issues with our fairly new
kernel version.
With the above in mind we uprev to criu v3.4 which was recently
released. This requires several of the patches to be updated (mostly
context). We are able to drop the selinux related change as RSS
prevents the situation this was working around from happenning.
This was validated using https://criu.org/Simple_loop (and a few
variants).
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch')
-rw-r--r-- | recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch b/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch index a7214050..4908e474 100644 --- a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch +++ b/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch | |||
@@ -1,26 +1,26 @@ | |||
1 | From 7ebde06e00b591a88397dad74a1aa47fd562eb50 Mon Sep 17 00:00:00 2001 | 1 | From 78390305829316633acee2ca5607331b0e37a104 Mon Sep 17 00:00:00 2001 |
2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Tue, 16 Aug 2016 09:48:08 +0800 | 3 | Date: Fri, 8 Sep 2017 15:11:31 -0400 |
4 | Subject: [PATCH 1/2] criu: Change libraries install directory | 4 | Subject: [PATCH] criu: Change libraries install directory |
5 | 5 | ||
6 | Install the libraries into /usr/lib(or /usr/lib64) | 6 | Install the libraries into /usr/lib(or /usr/lib64) |
7 | 7 | ||
8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> | 8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
9 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
9 | --- | 10 | --- |
10 | Makefile.install | 13 ------------- | 11 | Makefile.install | 13 ------------- |
11 | 1 file changed, 13 deletions(-) | 12 | 1 file changed, 13 deletions(-) |
12 | 13 | ||
13 | diff --git a/Makefile.install b/Makefile.install | 14 | diff --git a/Makefile.install b/Makefile.install |
14 | index dbc22e1..a30dc96 100644 | 15 | index 3987bcc..73d98a4 100644 |
15 | --- a/Makefile.install | 16 | --- a/Makefile.install |
16 | +++ b/Makefile.install | 17 | +++ b/Makefile.install |
17 | @@ -11,19 +11,6 @@ LIBDIR ?= $(PREFIX)/lib | 18 | @@ -9,19 +9,6 @@ LIBEXECDIR ?= $(PREFIX)/libexec |
18 | INCLUDEDIR ?= $(PREFIX)/include/criu | 19 | RUNDIR ?= /run |
19 | LIBEXECDIR ?= $(PREFIX)/libexec | ||
20 | 20 | ||
21 | -# | 21 | # |
22 | -# For recent Debian/Ubuntu with multiarch support. | 22 | -# For recent Debian/Ubuntu with multiarch support. |
23 | -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) | 23 | -DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) |
24 | -ifneq "$(DEB_HOST_MULTIARCH)" "" | 24 | -ifneq "$(DEB_HOST_MULTIARCH)" "" |
25 | - LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) | 25 | - LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) |
26 | -else | 26 | -else |
@@ -31,8 +31,9 @@ index dbc22e1..a30dc96 100644 | |||
31 | - endif | 31 | - endif |
32 | -endif | 32 | -endif |
33 | - | 33 | - |
34 | export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR | 34 | -# |
35 | export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR | 35 | # LIBDIR falls back to the standard path. |
36 | LIBDIR ?= $(PREFIX)/lib | ||
36 | 37 | ||
37 | -- | 38 | -- |
38 | 2.7.4 | 39 | 2.7.4 |