summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-29 23:15:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:27 +0000
commitccd25825a0466d5a445ab8ee52642076059abbaf (patch)
treeb4b5da0f28345262b37ca6d42575b8731f2f445d /meta
parent7976479ddb494d75a29b7e7566feaa0a5c57cf1a (diff)
downloadpoky-ccd25825a0466d5a445ab8ee52642076059abbaf.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: 207733bb875b1a6b932ecd04a34a0ee118511d1f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu/memfd.patch57
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.11.0.bb2
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 @@
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.11.0.bb b/meta/recipes-devtools/qemu/qemu_2.11.0.bb
index ccd8917f8d..8306db2ce5 100644
--- a/meta/recipes-devtools/qemu/qemu_2.11.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.11.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
21 file://chardev-connect-socket-to-a-spawned-command.patch \ 21 file://chardev-connect-socket-to-a-spawned-command.patch \
22 file://apic-fixup-fallthrough-to-PIC.patch \ 22 file://apic-fixup-fallthrough-to-PIC.patch \
23 file://linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ 23 file://linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
24 file://memfd.patch \
24 " 25 "
25UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar" 26UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar"
26 27
@@ -55,4 +56,3 @@ do_install_ptest() {
55 sed -i -e '/wildcard config-host.mak/d' \ 56 sed -i -e '/wildcard config-host.mak/d' \
56 -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include 57 -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
57} 58}
58