diff options
author | Ross Burton <ross.burton@intel.com> | 2018-03-19 18:00:12 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-26 15:07:11 +0100 |
commit | 0d36bbf8f9d93d10997afab19be307a0edd03853 (patch) | |
tree | 53517709d8e97ae5ae427e2aecf0e4e823a26a8e /meta | |
parent | d6f7a6d1dd1a26f2c163b1d0d45e876228a58e64 (diff) | |
download | poky-0d36bbf8f9d93d10997afab19be307a0edd03853.tar.gz |
qemu: fix memfd_create with glibc 2.27
glibc 2.27 has added memfd_create() but this conflicts with a copy in qemu, so
take a patch from upstream to fix building with glibc 2.27.
(From OE-Core rev: f90ce8913a4635ffb4ac0c585413e84f06793784)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/memfd.patch | 57 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_2.10.0.bb | 2 |
2 files changed, 58 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/memfd.patch b/meta/recipes-devtools/qemu/qemu/memfd.patch new file mode 100644 index 0000000000..62e8d3800b --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/memfd.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 | ||
5 | From: Paolo Bonzini <pbonzini@redhat.com> | ||
6 | Date: Tue, 28 Nov 2017 11:51:27 +0100 | ||
7 | Subject: [PATCH] memfd: fix configure test | ||
8 | MIME-Version: 1.0 | ||
9 | Content-Type: text/plain; charset=UTF-8 | ||
10 | Content-Transfer-Encoding: 8bit | ||
11 | |||
12 | Recent glibc added memfd_create in sys/mman.h. This conflicts with | ||
13 | the definition in util/memfd.c: | ||
14 | |||
15 | /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration | ||
16 | |||
17 | Fix the configure test, and remove the sys/memfd.h inclusion since the | ||
18 | file actually does not exist---it is a typo in the memfd_create(2) man | ||
19 | page. | ||
20 | |||
21 | Cc: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
22 | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> | ||
23 | --- | ||
24 | configure | 2 +- | ||
25 | util/memfd.c | 4 +--- | ||
26 | 2 files changed, 2 insertions(+), 4 deletions(-) | ||
27 | |||
28 | diff --git a/configure b/configure | ||
29 | index 9c8aa5a98b..99ccc1725a 100755 | ||
30 | --- a/configure | ||
31 | +++ b/configure | ||
32 | @@ -3923,7 +3923,7 @@ fi | ||
33 | # check if memfd is supported | ||
34 | memfd=no | ||
35 | cat > $TMPC << EOF | ||
36 | -#include <sys/memfd.h> | ||
37 | +#include <sys/mman.h> | ||
38 | |||
39 | int main(void) | ||
40 | { | ||
41 | diff --git a/util/memfd.c b/util/memfd.c | ||
42 | index 4571d1aba8..412e94a405 100644 | ||
43 | --- a/util/memfd.c | ||
44 | +++ b/util/memfd.c | ||
45 | @@ -31,9 +31,7 @@ | ||
46 | |||
47 | #include "qemu/memfd.h" | ||
48 | |||
49 | -#ifdef CONFIG_MEMFD | ||
50 | -#include <sys/memfd.h> | ||
51 | -#elif defined CONFIG_LINUX | ||
52 | +#if defined CONFIG_LINUX && !defined CONFIG_MEMFD | ||
53 | #include <sys/syscall.h> | ||
54 | #include <asm/unistd.h> | ||
55 | |||
56 | -- | ||
57 | 2.11.0 | ||
diff --git a/meta/recipes-devtools/qemu/qemu_2.10.0.bb b/meta/recipes-devtools/qemu/qemu_2.10.0.bb index a9b4939b04..bdf6c21f87 100644 --- a/meta/recipes-devtools/qemu/qemu_2.10.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.10.0.bb | |||
@@ -29,6 +29,7 @@ SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \ | |||
29 | file://CVE-2017-13672.patch \ | 29 | file://CVE-2017-13672.patch \ |
30 | file://CVE-2017-14167.patch \ | 30 | file://CVE-2017-14167.patch \ |
31 | file://ppc_locking.patch \ | 31 | file://ppc_locking.patch \ |
32 | file://memfd.patch \ | ||
32 | " | 33 | " |
33 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar" | 34 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar" |
34 | 35 | ||
@@ -60,4 +61,3 @@ do_install_ptest() { | |||
60 | 61 | ||
61 | cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests | 62 | cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests |
62 | } | 63 | } |
63 | |||