summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-19 15:58:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:13:48 (GMT)
commit6026ef7fadf605acc52b6644bef79f148820357e (patch)
treeb6cb213f2e615f003ded306e3ea75901e68f68a7
parentafa57d3bc928655986d35c7c99c011c6d71932dd (diff)
downloadpoky-6026ef7fadf605acc52b6644bef79f148820357e.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: da02349c540a8e17073fef8f3ca3ea8c796d6ade) 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>
-rw-r--r--meta/recipes-devtools/qemu/qemu/memfd.patch57
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.7.0.bb1
2 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/memfd.patch b/meta/recipes-devtools/qemu/qemu/memfd.patch
new file mode 100644
index 0000000..62e8d38
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/memfd.patch
@@ -0,0 +1,57 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
5From: Paolo Bonzini <pbonzini@redhat.com>
6Date: Tue, 28 Nov 2017 11:51:27 +0100
7Subject: [PATCH] memfd: fix configure test
8MIME-Version: 1.0
9Content-Type: text/plain; charset=UTF-8
10Content-Transfer-Encoding: 8bit
11
12Recent glibc added memfd_create in sys/mman.h. This conflicts with
13the 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
17Fix the configure test, and remove the sys/memfd.h inclusion since the
18file actually does not exist---it is a typo in the memfd_create(2) man
19page.
20
21Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
22Signed-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
28diff --git a/configure b/configure
29index 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 {
41diff --git a/util/memfd.c b/util/memfd.c
42index 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--
572.11.0
diff --git a/meta/recipes-devtools/qemu/qemu_2.7.0.bb b/meta/recipes-devtools/qemu/qemu_2.7.0.bb
index 85aadec..65ae539 100644
--- a/meta/recipes-devtools/qemu/qemu_2.7.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.7.0.bb
@@ -14,6 +14,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
14 file://0003-fix-CVE-2016-7908.patch \ 14 file://0003-fix-CVE-2016-7908.patch \
15 file://0004-fix-CVE-2016-7909.patch \ 15 file://0004-fix-CVE-2016-7909.patch \
16 file://04b33e21866412689f18b7ad6daf0a54d8f959a7.patch \ 16 file://04b33e21866412689f18b7ad6daf0a54d8f959a7.patch \
17 file://memfd.patch \
17" 18"
18 19
19SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 20SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"