summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2014-06-23 14:28:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 12:28:51 +0100
commit58e3c4d56be159fe8dedd398527caf625458f380 (patch)
treebfcd058c361db5816882960697838b1e9db01473 /meta/recipes-devtools
parent97899bc908a421295d814801ff86edeb9304d2fd (diff)
downloadpoky-58e3c4d56be159fe8dedd398527caf625458f380.tar.gz
qemu: exclude some ARM EABI obsolete syscalls
some syscalls are obsolete and no longer available for EABI, exclude them to fix the below error: In file included from qemu-seccomp.c:16:0: qemu-seccomp.c:28:7: error: '__NR_select' undeclared here (not in a function) { SCMP_SYS(select), 252 }, ^ qemu-seccomp.c:36:7: error: '__NR_mmap' undeclared here (not in a function) { SCMP_SYS(mmap), 247 }, ^ qemu-seccomp.c:57:7: error: '__NR_getrlimit' undeclared here (not in a function) { SCMP_SYS(getrlimit), 245 }, ^ qemu-seccomp.c:96:7: error: '__NR_time' undeclared here (not in a function) { SCMP_SYS(time), 245 }, ^ qemu-seccomp.c:185:7: error: '__NR_alarm' undeclared here (not in a function) { SCMP_SYS(alarm), 241 }, please refer source files: arch/arm/include/uapi/asm/unistd.h or kernel header: /usr/include/asm/unistd.h (From OE-Core rev: 49257247fdc57e9296520bbd598fd8cbf425d44a) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/files/exclude-some-arm-EABI-obsolete-syscalls.patch93
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
2 files changed, 94 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/files/exclude-some-arm-EABI-obsolete-syscalls.patch b/meta/recipes-devtools/qemu/files/exclude-some-arm-EABI-obsolete-syscalls.patch
new file mode 100644
index 0000000000..171bda7e95
--- /dev/null
+++ b/meta/recipes-devtools/qemu/files/exclude-some-arm-EABI-obsolete-syscalls.patch
@@ -0,0 +1,93 @@
1[PATCH] exclude some arm EABI obsolete syscalls
2
3Upstream-Status: Pending
4
5some syscalls are obsolete and no longer available for EABI, exclude them to
6fix 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
23please refer source files:
24 arch/arm/include/uapi/asm/unistd.h
25or kernel header:
26 /usr/include/asm/unistd.h
27
28Signed-off-by: Roy.Li <rongqing.li@windriver.com>
29---
30 qemu-seccomp.c | 14 ++++++++------
31 1 file changed, 8 insertions(+), 6 deletions(-)
32
33diff --git a/qemu-seccomp.c b/qemu-seccomp.c
34index caa926e..5a78502 100644
35--- a/qemu-seccomp.c
36+++ b/qemu-seccomp.c
37@@ -25,15 +25,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@@ -48,13 +54,11 @@ 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 { SCMP_SYS(prctl), 245 },
70 { SCMP_SYS(signalfd), 245 },
71- { SCMP_SYS(getrlimit), 245 },
72 { SCMP_SYS(set_tid_address), 245 },
73 { SCMP_SYS(statfs), 245 },
74 { SCMP_SYS(unlink), 245 },
75@@ -93,7 +97,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
76 { SCMP_SYS(times), 245 },
77 { SCMP_SYS(exit), 245 },
78 { SCMP_SYS(clock_gettime), 245 },
79- { SCMP_SYS(time), 245 },
80 { SCMP_SYS(restart_syscall), 245 },
81 { SCMP_SYS(pwrite64), 245 },
82 { SCMP_SYS(nanosleep), 245 },
83@@ -182,7 +185,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
84 { SCMP_SYS(lstat64), 241 },
85 { SCMP_SYS(sendfile64), 241 },
86 { SCMP_SYS(ugetrlimit), 241 },
87- { SCMP_SYS(alarm), 241 },
88 { SCMP_SYS(rt_sigsuspend), 241 },
89 { SCMP_SYS(rt_sigqueueinfo), 241 },
90 { SCMP_SYS(rt_tgsigqueueinfo), 241 },
91--
921.9.1
93
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 611ee61beb..ccd7908bc5 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -20,6 +20,7 @@ SRC_URI = "\
20 file://no-strip.patch \ 20 file://no-strip.patch \
21 file://larger_default_ram_size.patch \ 21 file://larger_default_ram_size.patch \
22 file://disable-grabs.patch \ 22 file://disable-grabs.patch \
23 file://exclude-some-arm-EABI-obsolete-syscalls.patch \
23 " 24 "
24 25
25SRC_URI_append_class-native = "\ 26SRC_URI_append_class-native = "\