diff options
author | Alistair Francis <alistair.francis@xilinx.com> | 2018-01-17 13:39:06 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-18 12:50:37 +0000 |
commit | a69425e49a44a7f9a2f045506d92b9c41e667257 (patch) | |
tree | 30b172adcf4852d98ffd204c81051afccc9bd997 /meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch | |
parent | f4fb8ecb8a0552cb637335ce56499e9df3998933 (diff) | |
download | poky-a69425e49a44a7f9a2f045506d92b9c41e667257.tar.gz |
qemu: Bump to version 2.11.0
Use the latest QEMU release 2.11. Remove all patches that are no longer
required as they have been merged into the 2.11 releaese. One patch had
to be updated to apply to the 2.11 tree.
This also applies a linux user patch to avoid webkitgtk build hangs.
(From OE-Core rev: d6d0d99569e0d8b62a61e27d389e7939af45bab9)
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch b/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch deleted file mode 100644 index f593cf9ae0..0000000000 --- a/meta/recipes-devtools/qemu/qemu/exclude-some-arm-EABI-obsolete-syscalls.patch +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | [PATCH] exclude some arm EABI obsolete syscalls | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | some syscalls are obsolete and no longer available for EABI, exclude them to | ||
6 | fix the below error: | ||
7 | In file included from qemu-seccomp.c:16:0: | ||
8 | qemu-seccomp.c:28:7: error: '__NR_select' undeclared here (not in a function) | ||
9 | { SCMP_SYS(select), 252 }, | ||
10 | ^ | ||
11 | qemu-seccomp.c:36:7: error: '__NR_mmap' undeclared here (not in a function) | ||
12 | { SCMP_SYS(mmap), 247 }, | ||
13 | ^ | ||
14 | qemu-seccomp.c:57:7: error: '__NR_getrlimit' undeclared here (not in a function) | ||
15 | { SCMP_SYS(getrlimit), 245 }, | ||
16 | ^ | ||
17 | qemu-seccomp.c:96:7: error: '__NR_time' undeclared here (not in a function) | ||
18 | { SCMP_SYS(time), 245 }, | ||
19 | ^ | ||
20 | qemu-seccomp.c:185:7: error: '__NR_alarm' undeclared here (not in a function) | ||
21 | { SCMP_SYS(alarm), 241 }, | ||
22 | |||
23 | please refer source files: | ||
24 | arch/arm/include/uapi/asm/unistd.h | ||
25 | or kernel header: | ||
26 | /usr/include/asm/unistd.h | ||
27 | |||
28 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
29 | --- | ||
30 | qemu-seccomp.c | 13 ++++++++----- | ||
31 | 1 file changed, 8 insertions(+), 5 deletions(-) | ||
32 | |||
33 | diff --git a/qemu-seccomp.c b/qemu-seccomp.c | ||
34 | index df75d9c..0e577f8 100644 | ||
35 | --- a/qemu-seccomp.c | ||
36 | +++ b/qemu-seccomp.c | ||
37 | @@ -35,15 +35,21 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { | ||
38 | { SCMP_SYS(timer_settime), 255 }, | ||
39 | { SCMP_SYS(timer_gettime), 254 }, | ||
40 | { SCMP_SYS(futex), 253 }, | ||
41 | +#if !defined(__ARM_EABI__) | ||
42 | { SCMP_SYS(select), 252 }, | ||
43 | + { SCMP_SYS(time), 245 }, | ||
44 | + { SCMP_SYS(alarm), 241 }, | ||
45 | + { SCMP_SYS(getrlimit), 245 }, | ||
46 | + { SCMP_SYS(mmap), 247 }, | ||
47 | + { SCMP_SYS(socketcall), 250 }, | ||
48 | + { SCMP_SYS(ipc), 245 }, | ||
49 | +#endif | ||
50 | { SCMP_SYS(recvfrom), 251 }, | ||
51 | { SCMP_SYS(sendto), 250 }, | ||
52 | - { SCMP_SYS(socketcall), 250 }, | ||
53 | { SCMP_SYS(read), 249 }, | ||
54 | { SCMP_SYS(io_submit), 249 }, | ||
55 | { SCMP_SYS(brk), 248 }, | ||
56 | { SCMP_SYS(clone), 247 }, | ||
57 | - { SCMP_SYS(mmap), 247 }, | ||
58 | { SCMP_SYS(mprotect), 246 }, | ||
59 | { SCMP_SYS(execve), 245 }, | ||
60 | { SCMP_SYS(open), 245 }, | ||
61 | @@ -58,7 +64,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { | ||
62 | { SCMP_SYS(bind), 245 }, | ||
63 | { SCMP_SYS(listen), 245 }, | ||
64 | { SCMP_SYS(semget), 245 }, | ||
65 | - { SCMP_SYS(ipc), 245 }, | ||
66 | { SCMP_SYS(gettimeofday), 245 }, | ||
67 | { SCMP_SYS(readlink), 245 }, | ||
68 | { SCMP_SYS(access), 245 }, | ||
69 | @@ -104,7 +109,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { | ||
70 | { SCMP_SYS(times), 245 }, | ||
71 | { SCMP_SYS(exit), 245 }, | ||
72 | { SCMP_SYS(clock_gettime), 245 }, | ||
73 | - { SCMP_SYS(time), 245 }, | ||
74 | { SCMP_SYS(restart_syscall), 245 }, | ||
75 | { SCMP_SYS(pwrite64), 245 }, | ||
76 | { SCMP_SYS(nanosleep), 245 }, | ||
77 | @@ -194,7 +198,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { | ||
78 | { SCMP_SYS(lstat64), 241 }, | ||
79 | { SCMP_SYS(sendfile64), 241 }, | ||
80 | { SCMP_SYS(ugetrlimit), 241 }, | ||
81 | - { SCMP_SYS(alarm), 241 }, | ||
82 | { SCMP_SYS(rt_sigsuspend), 241 }, | ||
83 | { SCMP_SYS(rt_sigqueueinfo), 241 }, | ||
84 | { SCMP_SYS(rt_tgsigqueueinfo), 241 }, | ||
85 | -- | ||
86 | 2.1.4 | ||
87 | |||