summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-31 17:17:18 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-31 17:17:18 +0000
commit1357f754b137ecd455c4d15c3181613b08b1982a (patch)
treed8dbc3ba15f9e05ef62055bdb24eda52b3ba1db6 /meta
parent83494fc2e3fa8972559711b6efe60e84c5eca0bf (diff)
downloadpoky-1357f754b137ecd455c4d15c3181613b08b1982a.tar.gz
strace: Upgrade to 4.5.18
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/strace/strace-4.5.14/arm-eabi.patch65
-rw-r--r--meta/packages/strace/strace-4.5.14/drop-ctl-proc.patch12
-rw-r--r--meta/packages/strace/strace-4.5.14/glibc-2.5.patch11
-rw-r--r--meta/packages/strace/strace-4.5.14/sh-arch-update.patch21
-rw-r--r--meta/packages/strace/strace-4.5.14/sh-syscall-update.patch268
-rw-r--r--meta/packages/strace/strace-4.5.18/strace-fix-arm-bad-syscall.patch (renamed from meta/packages/strace/strace/strace-fix-arm-bad-syscall.patch)0
-rw-r--r--meta/packages/strace/strace-4.5.18/strace-undef-syscall.patch (renamed from meta/packages/strace/strace/strace-undef-syscall.patch)68
-rw-r--r--meta/packages/strace/strace/arm-compilation.patch10
-rw-r--r--meta/packages/strace/strace/arm-syscall.patch16
-rw-r--r--meta/packages/strace/strace/arm-syscallent.patch402
-rw-r--r--meta/packages/strace/strace/linux-headers-fix.patch15
-rw-r--r--meta/packages/strace/strace_4.5.14.bb17
-rw-r--r--meta/packages/strace/strace_4.5.18.bb (renamed from meta/packages/strace/strace_4.5.15.bb)7
13 files changed, 34 insertions, 878 deletions
diff --git a/meta/packages/strace/strace-4.5.14/arm-eabi.patch b/meta/packages/strace/strace-4.5.14/arm-eabi.patch
deleted file mode 100644
index 53e27f8ce8..0000000000
--- a/meta/packages/strace/strace-4.5.14/arm-eabi.patch
+++ /dev/null
@@ -1,65 +0,0 @@
12006-03-30 Daniel Jacobowitz <dan@codesourcery.com>
2
3 * process.c (change_syscall): Add ARM support.
4 * syscall.c (get_scno): Handle ARM EABI.
5
6Index: strace/process.c
7===================================================================
8--- strace.orig/process.c 2006-03-30 17:36:14.000000000 -0500
9+++ strace/process.c 2006-03-30 17:44:16.000000000 -0500
10@@ -694,6 +694,16 @@ int new;
11 0x100000 | new) < 0)
12 return -1;
13 return 0;
14+#elif defined(ARM)
15+ /* Some kernels support this, some (pre-2.6.16 or so) don't. */
16+# ifndef PTRACE_SET_SYSCALL
17+# define PTRACE_SET_SYSCALL 23
18+# endif
19+
20+ if (ptrace (PTRACE_SET_SYSCALL, tcp->pid, 0, new) != 0)
21+ return -1;
22+
23+ return 0;
24 #else
25 #warning Do not know how to handle change_syscall for this architecture
26 #endif /* architecture */
27Index: strace/syscall.c
28===================================================================
29--- strace.orig/syscall.c 2006-03-30 17:36:14.000000000 -0500
30+++ strace/syscall.c 2006-03-30 17:44:16.000000000 -0500
31@@ -1108,16 +1108,25 @@ struct tcb *tcp;
32 return 0;
33 }
34
35- if ((scno & 0x0ff00000) != 0x0f900000) {
36- fprintf(stderr, "syscall: unknown syscall trap 0x%08lx\n",
37- scno);
38- return -1;
39- }
40+ /* Handle the EABI syscall convention. We do not
41+ bother converting structures between the two
42+ ABIs, but basic functionality should work even
43+ if strace and the traced program have different
44+ ABIs. */
45+ if (scno == 0xef000000) {
46+ scno = regs.ARM_r7;
47+ } else {
48+ if ((scno & 0x0ff00000) != 0x0f900000) {
49+ fprintf(stderr, "syscall: unknown syscall trap 0x%08lx\n",
50+ scno);
51+ return -1;
52+ }
53
54- /*
55- * Fixup the syscall number
56- */
57- scno &= 0x000fffff;
58+ /*
59+ * Fixup the syscall number
60+ */
61+ scno &= 0x000fffff;
62+ }
63 }
64
65 if (tcp->flags & TCB_INSYSCALL) {
diff --git a/meta/packages/strace/strace-4.5.14/drop-ctl-proc.patch b/meta/packages/strace/strace-4.5.14/drop-ctl-proc.patch
deleted file mode 100644
index 468913774a..0000000000
--- a/meta/packages/strace/strace-4.5.14/drop-ctl-proc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: strace-4.5.14/system.c
2===================================================================
3--- strace-4.5.14.orig/system.c 2006-10-01 13:02:08.000000000 +0200
4+++ strace-4.5.14/system.c 2006-10-01 13:02:27.000000000 +0200
5@@ -1578,7 +1578,6 @@
6 { CTL_KERN, "CTL_KERN" },
7 { CTL_VM, "CTL_VM" },
8 { CTL_NET, "CTL_NET" },
9- { CTL_PROC, "CTL_PROC" },
10 { CTL_FS, "CTL_FS" },
11 { CTL_DEBUG, "CTL_DEBUG" },
12 { CTL_DEV, "CTL_DEV" },
diff --git a/meta/packages/strace/strace-4.5.14/glibc-2.5.patch b/meta/packages/strace/strace-4.5.14/glibc-2.5.patch
deleted file mode 100644
index 3ee6b3de75..0000000000
--- a/meta/packages/strace/strace-4.5.14/glibc-2.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- strace-4.5.14/strace.c~ 2006-10-14 14:54:54.000000000 +1000
2+++ strace-4.5.14/strace.c 2006-10-14 14:54:54.000000000 +1000
3@@ -2251,7 +2251,7 @@
4 if (!cflag
5 && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
6 unsigned long addr = 0, pc = 0;
7-#ifdef PT_GETSIGINFO
8+#if defined(PT_GETSIGINFO) && defined(IA64)
9 # define PSR_RI 41
10 struct siginfo si;
11 unsigned long psr;
diff --git a/meta/packages/strace/strace-4.5.14/sh-arch-update.patch b/meta/packages/strace/strace-4.5.14/sh-arch-update.patch
deleted file mode 100644
index e40673a616..0000000000
--- a/meta/packages/strace/strace-4.5.14/sh-arch-update.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Strace doesn't know that sh3 and sh4 should be treated as sh and sh5 as
2sh64. Originally this was solved by ac_cv_host in the site files, however
3doing it in the site file breaks the glibc build, so teach strace about them
4instead.
5
6--- strace-4.5.14/configure.ac 2006/05/11 07:12:05 1.1
7+++ strace-4.5.14/configure.ac 2006/05/11 07:15:42
8@@ -91,11 +91,11 @@
9 arch=hppa
10 AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.])
11 ;;
12-sh)
13+sh|sh3*|sh4*)
14 arch=sh
15 AC_DEFINE([SH], 1, [Define for the SH architecture.])
16 ;;
17-sh64)
18+sh64|sh5*)
19 arch=sh64
20 AC_DEFINE([SH64], 1, [Define for the SH64 architecture.])
21 ;;
diff --git a/meta/packages/strace/strace-4.5.14/sh-syscall-update.patch b/meta/packages/strace/strace-4.5.14/sh-syscall-update.patch
deleted file mode 100644
index 15102934e7..0000000000
--- a/meta/packages/strace/strace-4.5.14/sh-syscall-update.patch
+++ /dev/null
@@ -1,268 +0,0 @@
1--- strace/linux/sh/syscallent.h 2006/07/03 04:32:27 1.1
2+++ strace/linux/sh/syscallent.h 2006/07/03 05:29:55
3@@ -46,7 +46,7 @@
4 { 1, 0, sys_time, "time" }, /* 13 */
5 { 3, TF, sys_mknod, "mknod" }, /* 14 */
6 { 2, TF, sys_chmod, "chmod" }, /* 15 */
7- { 3, TF, sys_chown, "lchown" }, /* 16 */
8+ { 3, TF, sys_chown, "lchown" }, /* 16 */
9 { 0, 0, sys_break, "break" }, /* 17 */
10 { 2, TF, sys_oldstat, "oldstat" }, /* 18 */
11 { 3, TD, sys_lseek, "lseek" }, /* 19 */
12@@ -229,109 +229,157 @@
13 { 2, TF, sys_stat64, "stat64" }, /* 195 */
14 { 2, TF, sys_lstat64, "lstat64" }, /* 196 */
15 { 2, TD, sys_fstat64, "fstat64" }, /* 197 */
16-/*TODO*/{ 3, TF, printargs, "lchown32" }, /* 198 */
17-/*TODO*/{ 0, 0, printargs, "getuid32" }, /* 199 */
18+ { 3, TF, sys_chown, "lchown32" }, /* 198 */
19+ { 0, 0, sys_getuid, "getuid32" }, /* 199 */
20
21- { 0, 0, printargs, "getgid32" }, /* 200 */
22- { 0, 0, printargs, "geteuid32" }, /* 201 */
23- { 0, 0, printargs, "getegid32" }, /* 202 */
24- { 2, 0, printargs, "setreuid32" }, /* 203 */
25- { 2, 0, printargs, "setregid32" }, /* 204 */
26- { 2, 0, sys_getgroups32, "getgroups32" }, /* 205 */
27- { 2, 0, sys_setgroups32, "setgroups32" }, /* 206 */
28- { 3, 0, printargs, "fchown32" }, /* 207 */
29- { 3, 0, printargs, "setresuid32" }, /* 208 */
30- { 3, 0, printargs, "getresuid32" }, /* 209 */
31- { 3, 0, printargs, "setresgid32" }, /* 210 */
32- { 3, 0, printargs, "getsetgid32" }, /* 211 */
33- { 3, TF, printargs, "chown32" }, /* 212 */
34- { 1, 0, printargs, "setuid32" }, /* 213 */
35- { 1, 0, printargs, "setgid32" }, /* 214 */
36- { 1, 0, printargs, "setfsuid32" }, /* 215 */
37- { 1, 0, printargs, "setfsgid32" }, /* 216 */
38+ { 0, 0, sys_getgid, "getgid32" }, /* 200 */
39+ { 0, 0, sys_geteuid, "geteuid32" }, /* 201 */
40+ { 0, 0, sys_getegid, "getegid32" }, /* 202 */
41+ { 2, 0, sys_setreuid, "setreuid32" }, /* 203 */
42+ { 2, 0, sys_setregid, "setregid32" }, /* 204 */
43+ { 2, 0, sys_getgroups, "getgroups32" }, /* 205 */
44+ { 2, 0, sys_setgroups, "setgroups32" }, /* 206 */
45+ { 3, 0, sys_fchown, "fchown32" }, /* 207 */
46+ { 3, 0, sys_setresuid, "setresuid32" }, /* 208 */
47+ { 3, 0, sys_getresuid, "getresuid32" }, /* 209 */
48+ { 3, 0, sys_setresgid, "setresgid32" }, /* 210 */
49+ { 3, 0, sys_getresgid, "getsetgid32" }, /* 211 */
50+ { 3, TF, sys_chown, "chown32" }, /* 212 */
51+ { 1, 0, sys_setuid, "setuid32" }, /* 213 */
52+ { 1, 0, sys_setgid, "setgid32" }, /* 214 */
53+ { 1, 0, sys_setfsuid, "setfsuid32" }, /* 215 */
54+ { 1, 0, sys_setfsgid, "setfsgid32" }, /* 216 */
55 { 2, TF, sys_pivotroot, "pivot_root" }, /* 217 */
56- { 3, 0, printargs, "mincore" }, /* 218 */
57+ { 3, 0, sys_mincore, "mincore" }, /* 218 */
58 { 3, 0, sys_madvise, "madvise" }, /* 219 */
59- { 4, 0, printargs, "getdents64" }, /* 220 */
60+ { 4, 0, sys_getdents64, "getdents64" }, /* 220 */
61 { 3, TD, sys_fcntl, "fcntl64" }, /* 221 */
62 { 4, 0, printargs, "SYS_222" }, /* 222 */
63- { 4, 0, printargs, "SYS_223" }, /* 223 */
64- { 4, 0, printargs, "SYS_224" }, /* 224 */
65- { 5, 0, printargs, "SYS_225" }, /* 225 */
66- { 5, 0, printargs, "SYS_226" }, /* 226 */
67- { 5, 0, printargs, "SYS_227" }, /* 227 */
68- { 5, 0, printargs, "SYS_228" }, /* 228 */
69- { 5, 0, printargs, "SYS_229" }, /* 229 */
70-
71- { 8, 0, printargs, "socket_subcall"}, /* 230 */
72- { 3, TN, sys_socket, "socket" }, /* 231 */
73- { 3, TN, sys_bind, "bind" }, /* 232 */
74- { 3, TN, sys_connect, "connect" }, /* 233 */
75- { 2, TN, sys_listen, "listen" }, /* 234 */
76- { 3, TN, sys_accept, "accept" }, /* 235 */
77- { 3, TN, sys_getsockname, "getsockname" }, /* 236 */
78- { 3, TN, sys_getpeername, "getpeername" }, /* 237 */
79- { 4, TN, sys_socketpair, "socketpair" }, /* 238 */
80- { 4, TN, sys_send, "send" }, /* 239 */
81- { 4, TN, sys_recv, "recv" }, /* 240 */
82- { 6, TN, sys_sendto, "sendto" }, /* 241 */
83- { 6, TN, sys_recvfrom, "recvfrom" }, /* 242 */
84- { 2, TN, sys_shutdown, "shutdown" }, /* 243 */
85- { 5, TN, sys_setsockopt, "setsockopt" }, /* 244 */
86- { 5, TN, sys_getsockopt, "getsockopt" }, /* 245 */
87- { 5, TN, sys_sendmsg, "sendmsg" }, /* 246 */
88- { 5, TN, sys_recvmsg, "recvmsg" }, /* 247 */
89- { 5, 0, printargs, "SYS_248" }, /* 248 */
90- { 5, 0, printargs, "SYS_249" }, /* 249 */
91-
92- { 4, 0, printargs, "ipc_subcall" }, /* 250 */
93- { 4, TI, sys_semop, "semop" }, /* 251 */
94- { 4, TI, sys_semget, "semget" }, /* 252 */
95- { 4, TI, sys_semctl, "semctl" }, /* 253 */
96- { 4, 0, printargs, "ipc_subcall" }, /* 254 */
97- { 4, 0, printargs, "ipc_subcall" }, /* 255 */
98- { 4, 0, printargs, "ipc_subcall" }, /* 256 */
99- { 4, 0, printargs, "ipc_subcall" }, /* 257 */
100- { 4, 0, printargs, "ipc_subcall" }, /* 258 */
101- { 4, 0, printargs, "ipc_subcall" }, /* 259 */
102- { 4, 0, printargs, "ipc_subcall" }, /* 260 */
103- { 4, TI, sys_msgsnd, "msgsnd" }, /* 261 */
104- { 4, TI, sys_msgrcv, "msgrcv" }, /* 262 */
105- { 4, TI, sys_msgget, "msgget" }, /* 263 */
106- { 4, TI, sys_msgctl, "msgctl" }, /* 264 */
107- { 4, 0, printargs, "ipc_subcall" }, /* 265 */
108- { 4, 0, printargs, "ipc_subcall" }, /* 266 */
109- { 4, 0, printargs, "ipc_subcall" }, /* 267 */
110- { 4, 0, printargs, "ipc_subcall" }, /* 268 */
111- { 4, 0, printargs, "ipc_subcall" }, /* 269 */
112- { 4, 0, printargs, "ipc_subcall" }, /* 270 */
113- { 4, TI, sys_shmat, "shmat" }, /* 271 */
114- { 4, TI, sys_shmdt, "shmdt" }, /* 272 */
115- { 4, TI, sys_shmget, "shmget" }, /* 273 */
116- { 4, TI, sys_shmctl, "shmctl" }, /* 274 */
117- { 5, 0, printargs, "SYS_275" }, /* 275 */
118- { 5, 0, printargs, "SYS_276" }, /* 276 */
119- { 5, 0, printargs, "SYS_277" }, /* 277 */
120- { 5, 0, printargs, "SYS_278" }, /* 278 */
121- { 5, 0, printargs, "SYS_279" }, /* 279 */
122-
123- { 8, 0, printargs, "socket_subcall"}, /* 280 */
124- { 3, TN, sys_socket, "socket" }, /* 281 */
125- { 3, TN, sys_bind, "bind" }, /* 282 */
126- { 3, TN, sys_connect, "connect" }, /* 283 */
127- { 2, TN, sys_listen, "listen" }, /* 284 */
128- { 3, TN, sys_accept, "accept" }, /* 285 */
129- { 3, TN, sys_getsockname, "getsockname" }, /* 286 */
130- { 3, TN, sys_getpeername, "getpeername" }, /* 287 */
131- { 4, TN, sys_socketpair, "socketpair" }, /* 288 */
132- { 4, TN, sys_send, "send" }, /* 289 */
133- { 4, TN, sys_recv, "recv" }, /* 290 */
134- { 6, TN, sys_sendto, "sendto" }, /* 291 */
135- { 6, TN, sys_recvfrom, "recvfrom" }, /* 292 */
136- { 2, TN, sys_shutdown, "shutdown" }, /* 293 */
137- { 5, TN, sys_setsockopt, "setsockopt" }, /* 294 */
138- { 5, TN, sys_getsockopt, "getsockopt" }, /* 295 */
139- { 5, TN, sys_sendmsg, "sendmsg" }, /* 296 */
140- { 5, TN, sys_recvmsg, "recvmsg" }, /* 297 */
141+ { 5, 0, printargs, "SYS_223" }, /* 223 */
142+ { 0, 0, printargs, "gettid" }, /* 224 */
143+ { 4, TD, sys_readahead, "readahead" }, /* 225 */
144+ { 5, TF, sys_setxattr, "setxattr" }, /* 226 */
145+ { 5, TF, sys_setxattr, "lsetxattr" }, /* 227 */
146+ { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 228 */
147+ { 4, TF, sys_getxattr, "getxattr" }, /* 229 */
148+ { 4, TF, sys_getxattr, "lgetxattr" }, /* 230 */
149+ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 231 */
150+ { 3, TF, sys_listxattr, "listxattr" }, /* 232 */
151+ { 3, TF, sys_listxattr, "llistxattr" }, /* 233 */
152+ { 3, 0, sys_flistxattr, "flistxattr" }, /* 234 */
153+ { 2, TF, sys_removexattr, "removexattr" }, /* 235 */
154+ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */
155+ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 237 */
156+ { 2, TS, sys_kill, "tkill" }, /* 238 */
157+ { 4, TF, sys_sendfile64, "sendfile64" }, /* 239 */
158+ { 5, 0, sys_futex, "futex" }, /* 240 */
159+ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 241 */
160+ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 242 */
161+ { 1, 0, printargs, "set_thread_area" }, /* 243 */
162+ { 1, 0, printargs, "get_thread_area" }, /* 244 */
163+ { 2, 0, sys_io_setup, "io_setup" }, /* 245 */
164+ { 1, 0, sys_io_destroy, "io_destroy" }, /* 246 */
165+ { 5, 0, sys_io_getevents, "io_getevents" }, /* 247 */
166+ { 3, 0, sys_io_submit, "io_submit" }, /* 248 */
167+ { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */
168+ { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */
169+ { 5, 0, printargs, "SYS_251" }, /* 251 */
170+ { 1, TP, sys_exit, "exit_group" }, /* 252 */
171+ { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
172+ { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
173+ { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
174+ { 4, 0, sys_epoll_wait, "epoll_wait" }, /* 256 */
175+ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 257 */
176+ { 1, 0, printargs, "set_tid_address"}, /* 258 */
177+ { 3, 0, sys_timer_create, "timer_create" }, /* 259 */
178+ { 4, 0, sys_timer_settime, "timer_settime" }, /* 260 */
179+ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 261 */
180+ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 262 */
181+ { 1, 0, sys_timer_delete, "timer_delete" }, /* 263 */
182+ { 2, 0, sys_clock_settime, "clock_settime" }, /* 264 */
183+ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 265 */
184+ { 2, 0, sys_clock_getres, "clock_getres" }, /* 266 */
185+ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 267 */
186+ { 3, TF, sys_statfs64, "statfs64" }, /* 268 */
187+ { 3, 0, sys_fstatfs64, "fstatfs64" }, /* 269 */
188+ { 3, TS, sys_tgkill, "tgkill" }, /* 270 */
189+ { 2, TF, sys_utimes, "utimes" }, /* 271 */
190+ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 272 */
191+ { 5, 0, printargs, "vserver" }, /* 273 */
192+ { 5, 0, printargs, "mbind" }, /* 274 */
193+ { 5, 0, printargs, "get_mempolicy" }, /* 275 */
194+ { 5, 0, printargs, "set_mempolicy" }, /* 276 */
195+ { 4, 0, sys_mq_open, "mq_open" }, /* 277 */
196+ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 278 */
197+ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 279 */
198+ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 280 */
199+ { 2, 0, sys_mq_notify, "mq_notify" }, /* 281 */
200+ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 282 */
201+ { 5, 0, printargs, "sys_kexec_load"}, /* 283 */
202+ { 5, TP, sys_waitid, "waitid" }, /* 284 */
203+ { 5, 0, printargs, "add_key" }, /* 285 */
204+ { 5, 0, printargs, "request_key" }, /* 286 */
205+ { 5, 0, printargs, "keyctl" }, /* 287 */
206+ { 5, 0, printargs, "ioprio_set" }, /* 288 */
207+ { 5, 0, printargs, "ioprio_get" }, /* 289 */
208+ { 5, 0, printargs, "inotify_init" }, /* 290 */
209+ { 5, 0, printargs, "inotify_add_watch" }, /* 291 */
210+ { 5, 0, printargs, "inotify_rm_watch" }, /* 292 */
211+ { 5, 0, printargs, "SYS_293" }, /* 293 */
212+ { 5, 0, printargs, "SYS_294" }, /* 294 */
213+ { 5, 0, printargs, "SYS_295" }, /* 295 */
214+ { 5, 0, printargs, "SYS_296" }, /* 296 */
215+ { 5, 0, printargs, "SYS_297" }, /* 297 */
216 { 5, 0, printargs, "SYS_298" }, /* 298 */
217 { 5, 0, printargs, "SYS_299" }, /* 299 */
218+
219+#if SYS_socket_subcall != 300
220+ #error fix me
221+#endif
222+ { 8, 0, printargs, "socket_subcall"}, /* 300 */
223+ { 3, TN, sys_socket, "socket" }, /* 301 */
224+ { 3, TN, sys_bind, "bind" }, /* 302 */
225+ { 3, TN, sys_connect, "connect" }, /* 303 */
226+ { 2, TN, sys_listen, "listen" }, /* 304 */
227+ { 3, TN, sys_accept, "accept" }, /* 305 */
228+ { 3, TN, sys_getsockname, "getsockname" }, /* 306 */
229+ { 3, TN, sys_getpeername, "getpeername" }, /* 307 */
230+ { 4, TN, sys_socketpair, "socketpair" }, /* 308 */
231+ { 4, TN, sys_send, "send" }, /* 309 */
232+ { 4, TN, sys_recv, "recv" }, /* 310 */
233+ { 6, TN, sys_sendto, "sendto" }, /* 311 */
234+ { 6, TN, sys_recvfrom, "recvfrom" }, /* 312 */
235+ { 2, TN, sys_shutdown, "shutdown" }, /* 313 */
236+ { 5, TN, sys_setsockopt, "setsockopt" }, /* 314 */
237+ { 5, TN, sys_getsockopt, "getsockopt" }, /* 315 */
238+ { 5, TN, sys_sendmsg, "sendmsg" }, /* 316 */
239+ { 5, TN, sys_recvmsg, "recvmsg" }, /* 317 */
240+
241+#if SYS_ipc_subcall != 318
242+ #error fix me
243+#endif
244+ { 4, 0, printargs, "ipc_subcall" }, /* 318 */
245+ { 4, TI, sys_semop, "semop" }, /* 319 */
246+ { 4, TI, sys_semget, "semget" }, /* 320 */
247+ { 4, TI, sys_semctl, "semctl" }, /* 321 */
248+ { 5, TI, sys_semtimedop, "semtimedop" }, /* 322 */
249+ { 4, 0, printargs, "ipc_subcall" }, /* 323 */
250+ { 4, 0, printargs, "ipc_subcall" }, /* 324 */
251+ { 4, 0, printargs, "ipc_subcall" }, /* 325 */
252+ { 4, 0, printargs, "ipc_subcall" }, /* 326 */
253+ { 4, 0, printargs, "ipc_subcall" }, /* 327 */
254+ { 4, 0, printargs, "ipc_subcall" }, /* 328 */
255+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 329 */
256+ { 4, TI, sys_msgrcv, "msgrcv" }, /* 330 */
257+ { 4, TI, sys_msgget, "msgget" }, /* 331 */
258+ { 4, TI, sys_msgctl, "msgctl" }, /* 332 */
259+ { 4, 0, printargs, "ipc_subcall" }, /* 333 */
260+ { 4, 0, printargs, "ipc_subcall" }, /* 334 */
261+ { 4, 0, printargs, "ipc_subcall" }, /* 335 */
262+ { 4, 0, printargs, "ipc_subcall" }, /* 336 */
263+ { 4, 0, printargs, "ipc_subcall" }, /* 337 */
264+ { 4, 0, printargs, "ipc_subcall" }, /* 338 */
265+ { 4, TI, sys_shmat, "shmat" }, /* 339 */
266+ { 4, TI, sys_shmdt, "shmdt" }, /* 340 */
267+ { 4, TI, sys_shmget, "shmget" }, /* 341 */
268+ { 4, TI, sys_shmctl, "shmctl" }, /* 342 */
diff --git a/meta/packages/strace/strace/strace-fix-arm-bad-syscall.patch b/meta/packages/strace/strace-4.5.18/strace-fix-arm-bad-syscall.patch
index d7d7426b74..d7d7426b74 100644
--- a/meta/packages/strace/strace/strace-fix-arm-bad-syscall.patch
+++ b/meta/packages/strace/strace-4.5.18/strace-fix-arm-bad-syscall.patch
diff --git a/meta/packages/strace/strace/strace-undef-syscall.patch b/meta/packages/strace/strace-4.5.18/strace-undef-syscall.patch
index 95166ea18a..ac33db4e78 100644
--- a/meta/packages/strace/strace/strace-undef-syscall.patch
+++ b/meta/packages/strace/strace-4.5.18/strace-undef-syscall.patch
@@ -2,23 +2,10 @@ Origin is http://buildroot.uclibc.org/cgi-bin/viewcvs.cgi/*checkout*/trunk/build
2 2
3This gets applied to fix build errors with uclibc on ARM EABI 3This gets applied to fix build errors with uclibc on ARM EABI
4 4
5--- strace-4.5.12/linux/syscallent.h.orig 2005-08-09 01:48:54.000000000 -0600 5Index: strace-4.5.18/linux/syscallent.h
6+++ strace-4.5.12/linux/syscallent.h 2005-08-09 01:50:23.000000000 -0600 6===================================================================
7@@ -298,7 +298,11 @@ 7--- strace-4.5.18.orig/linux/syscallent.h 2008-07-18 02:23:49.000000000 +0100
8 { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ 8+++ strace-4.5.18/linux/syscallent.h 2008-12-31 16:56:03.000000000 +0000
9 { 5, TF, sys_fadvise64, "fadvise64" }, /* 250 */
10 { 5, 0, printargs, "SYS_251" }, /* 251 */
11- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */
12+ { 1, TP, sys_exit, "exit_group"
13+#ifdef __NR_exit_group
14+ , __NR_exit_group
15+#endif
16+ }, /* 252 */
17 { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
18 { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
19 { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
20--- strace-4.5.15.orig/linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100
21+++ strace-4.5.15/linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100
22@@ -130,7 +130,10 @@ 9@@ -130,7 +130,10 @@
23 { 2, TF, sys_statfs, "statfs" }, /* 99 */ 10 { 2, TF, sys_statfs, "statfs" }, /* 99 */
24 { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ 11 { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */
@@ -43,24 +30,33 @@ This gets applied to fix build errors with uclibc on ARM EABI
43 { 1, TD, sys_fsync, "fsync" }, /* 118 */ 30 { 1, TD, sys_fsync, "fsync" }, /* 118 */
44 { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ 31 { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
45 { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ 32 { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */
46--- strace-4.5.15.orig/syscall.c 2007-02-04 19:03:48.000000000 +0100 33@@ -282,7 +288,11 @@
47+++ strace-4.5.15/syscall.c 2007-02-04 19:07:26.000000000 +0100 34 { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */
48@@ -2404,14 +2404,18 @@ 35 { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */
49 switch (known_scno(tcp)) { 36 { 5, 0, printargs, "SYS_251" }, /* 251 */
50 #ifdef LINUX 37- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */
51 #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) 38+ { 1, TP, sys_exit, "exit_group"
52+#ifdef __NR_socketcall 39+#ifdef __NR_exit_group
53 case SYS_socketcall: 40+ , __NR_exit_group
54 decode_subcall(tcp, SYS_socket_subcall,
55 SYS_socket_nsubcalls, deref_style);
56 break;
57+#endif 41+#endif
58+#ifdef __NR_ipc 42+ }, /* 252 */
59 case SYS_ipc: 43 { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
60 decode_subcall(tcp, SYS_ipc_subcall, 44 { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
61 SYS_ipc_nsubcalls, shift_style); 45 { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
62 break; 46Index: strace-4.5.18/linux/arm/syscallent.h
47===================================================================
48--- strace-4.5.18.orig/linux/arm/syscallent.h 2008-12-31 17:13:12.000000000 +0000
49+++ strace-4.5.18/linux/arm/syscallent.h 2008-12-31 17:15:02.000000000 +0000
50@@ -431,6 +431,7 @@
51 { 5, 0, printargs, "SYS_398" }, /* 398 */
52 { 5, 0, printargs, "SYS_399" }, /* 399 */
53
54+#if !defined(__ARM_EABI__)
55 #if SYS_socket_subcall != 400
56 #error fix me
57 #endif
58@@ -481,3 +482,4 @@
59 { 4, TI, sys_shmdt, "shmdt" }, /* 440 */
60 { 4, TI, sys_shmget, "shmget" }, /* 441 */
61 { 4, TI, sys_shmctl, "shmctl" }, /* 442 */
63+#endif 62+#endif
64 #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
65 #if defined (SPARC) || defined (SPARC64)
66 case SYS_socketcall:
diff --git a/meta/packages/strace/strace/arm-compilation.patch b/meta/packages/strace/strace/arm-compilation.patch
deleted file mode 100644
index 9dd7133ce1..0000000000
--- a/meta/packages/strace/strace/arm-compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- strace-4.4.98/syscall.c~arm-compilation 2003-06-04 01:29:04.000000000 +0200
2+++ strace-4.4.98/syscall.c 2003-09-01 00:13:02.000000000 +0200
3@@ -696,6 +696,7 @@
4 static int d0;
5 #elif defined (ARM)
6 static struct pt_regs regs;
7+ static long r0;
8 #elif defined (ALPHA)
9 static long r0;
10 static long a3;
diff --git a/meta/packages/strace/strace/arm-syscall.patch b/meta/packages/strace/strace/arm-syscall.patch
deleted file mode 100644
index 952d09bb24..0000000000
--- a/meta/packages/strace/strace/arm-syscall.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- /dev/null
7+++ strace-4.4.98/linux/arm/syscall.h
8@@ -0,0 +1,2 @@
9+#include "../syscall.h"
10+#include "dummy.h"
11--- /dev/null
12+++ strace-4.4.98/linux/arm/dummy.h
13@@ -0,0 +1,3 @@
14+#include "../dummy.h"
15+#undef SYS_waitpid
16+#define sys_waitpid printargs
diff --git a/meta/packages/strace/strace/arm-syscallent.patch b/meta/packages/strace/strace/arm-syscallent.patch
deleted file mode 100644
index dd23ab762b..0000000000
--- a/meta/packages/strace/strace/arm-syscallent.patch
+++ /dev/null
@@ -1,402 +0,0 @@
1--- /dev/null Fri Apr 23 21:29:25 2004
2+++ strace-4.5.4/linux/arm/syscallent.h Thu Sep 2 13:42:52 2004
3@@ -0,0 +1,399 @@
4+/*
5+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
6+ * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
7+ * All rights reserved.
8+ *
9+ * Redistribution and use in source and binary forms, with or without
10+ * modification, are permitted provided that the following conditions
11+ * are met:
12+ * 1. Redistributions of source code must retain the above copyright
13+ * notice, this list of conditions and the following disclaimer.
14+ * 2. Redistributions in binary form must reproduce the above copyright
15+ * notice, this list of conditions and the following disclaimer in the
16+ * documentation and/or other materials provided with the distribution.
17+ * 3. The name of the author may not be used to endorse or promote products
18+ * derived from this software without specific prior written permission.
19+ *
20+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
21+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
22+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
23+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
24+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
25+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+ *
31+ * $Id: syscallent.h,v 1.26 2004/04/16 21:48:44 roland Exp $
32+ */
33+
34+ { 0, 0, sys_setup, "setup" }, /* 0 */
35+ { 1, TP, sys_exit, "_exit" }, /* 1 */
36+ { 0, TP, sys_fork, "fork" }, /* 2 */
37+ { 3, 0, sys_read, "read" }, /* 3 */
38+ { 3, 0, sys_write, "write" }, /* 4 */
39+ { 3, TF, sys_open, "open" }, /* 5 */
40+ { 1, 0, sys_close, "close" }, /* 6 */
41+ { 3, TP, sys_waitpid, "waitpid" }, /* 7 */
42+ { 2, TF, sys_creat, "creat" }, /* 8 */
43+ { 2, TF, sys_link, "link" }, /* 9 */
44+ { 1, TF, sys_unlink, "unlink" }, /* 10 */
45+ { 3, TF|TP, sys_execve, "execve" }, /* 11 */
46+ { 1, TF, sys_chdir, "chdir" }, /* 12 */
47+ { 1, 0, sys_time, "time" }, /* 13 */
48+ { 3, TF, sys_mknod, "mknod" }, /* 14 */
49+ { 2, TF, sys_chmod, "chmod" }, /* 15 */
50+#ifdef M68K
51+ { 3, TF, sys_chown, "chown" }, /* 16 */
52+#else
53+ { 3, TF, sys_chown, "lchown" }, /* 16 */
54+#endif
55+ { 0, 0, sys_break, "break" }, /* 17 */
56+ { 2, TF, sys_oldstat, "oldstat" }, /* 18 */
57+ { 3, 0, sys_lseek, "lseek" }, /* 19 */
58+ { 0, 0, sys_getpid, "getpid" }, /* 20 */
59+ { 5, TF, sys_mount, "mount" }, /* 21 */
60+ { 1, TF, sys_umount, "oldumount" }, /* 22 */
61+ { 1, 0, sys_setuid, "setuid" }, /* 23 */
62+ { 0, 0, sys_getuid, "getuid" }, /* 24 */
63+ { 1, 0, sys_stime, "stime" }, /* 25 */
64+ { 4, 0, sys_ptrace, "ptrace" }, /* 26 */
65+ { 1, 0, sys_alarm, "alarm" }, /* 27 */
66+ { 2, 0, sys_oldfstat, "oldfstat" }, /* 28 */
67+ { 0, TS, sys_pause, "pause" }, /* 29 */
68+ { 2, TF, sys_utime, "utime" }, /* 30 */
69+ { 2, 0, sys_stty, "stty" }, /* 31 */
70+ { 2, 0, sys_gtty, "gtty" }, /* 32 */
71+ { 2, TF, sys_access, "access" }, /* 33 */
72+ { 1, 0, sys_nice, "nice" }, /* 34 */
73+ { 0, 0, sys_ftime, "ftime" }, /* 35 */
74+ { 0, 0, sys_sync, "sync" }, /* 36 */
75+ { 2, TS, sys_kill, "kill" }, /* 37 */
76+ { 2, TF, sys_rename, "rename" }, /* 38 */
77+ { 2, TF, sys_mkdir, "mkdir" }, /* 39 */
78+ { 1, TF, sys_rmdir, "rmdir" }, /* 40 */
79+ { 1, 0, sys_dup, "dup" }, /* 41 */
80+ { 1, 0, sys_pipe, "pipe" }, /* 42 */
81+ { 1, 0, sys_times, "times" }, /* 43 */
82+ { 0, 0, sys_prof, "prof" }, /* 44 */
83+ { 1, 0, sys_brk, "brk" }, /* 45 */
84+ { 1, 0, sys_setgid, "setgid" }, /* 46 */
85+ { 0, 0, sys_getgid, "getgid" }, /* 47 */
86+ { 3, TS, sys_signal, "signal" }, /* 48 */
87+ { 0, 0, sys_geteuid, "geteuid" }, /* 49 */
88+ { 0, 0, sys_getegid, "getegid" }, /* 50 */
89+ { 1, TF, sys_acct, "acct" }, /* 51 */
90+ { 2, TF, sys_umount2, "umount" }, /* 52 */
91+ { 0, 0, sys_lock, "lock" }, /* 53 */
92+ { 3, 0, sys_ioctl, "ioctl" }, /* 54 */
93+ { 3, 0, sys_fcntl, "fcntl" }, /* 55 */
94+ { 0, 0, sys_mpx, "mpx" }, /* 56 */
95+ { 2, 0, sys_setpgid, "setpgid" }, /* 57 */
96+ { 2, 0, sys_ulimit, "ulimit" }, /* 58 */
97+ { 1, 0, sys_oldolduname, "oldolduname" }, /* 59 */
98+ { 1, 0, sys_umask, "umask" }, /* 60 */
99+ { 1, TF, sys_chroot, "chroot" }, /* 61 */
100+ { 2, 0, sys_ustat, "ustat" }, /* 62 */
101+ { 2, 0, sys_dup2, "dup2" }, /* 63 */
102+ { 0, 0, sys_getppid, "getppid" }, /* 64 */
103+ { 0, 0, sys_getpgrp, "getpgrp" }, /* 65 */
104+ { 0, 0, sys_setsid, "setsid" }, /* 66 */
105+ { 3, TS, sys_sigaction, "sigaction" }, /* 67 */
106+ { 0, TS, sys_siggetmask, "siggetmask" }, /* 68 */
107+ { 1, TS, sys_sigsetmask, "sigsetmask" }, /* 69 */
108+ { 2, 0, sys_setreuid, "setreuid" }, /* 70 */
109+ { 2, 0, sys_setregid, "setregid" }, /* 71 */
110+ { 3, TS, sys_sigsuspend, "sigsuspend" }, /* 72 */
111+ { 1, TS, sys_sigpending, "sigpending" }, /* 73 */
112+ { 2, 0, sys_sethostname, "sethostname" }, /* 74 */
113+ { 2, 0, sys_setrlimit, "setrlimit" }, /* 75 */
114+ { 2, 0, sys_getrlimit, "old_getrlimit" }, /* 76 */
115+ { 2, 0, sys_getrusage, "getrusage" }, /* 77 */
116+ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 78 */
117+ { 2, 0, sys_settimeofday, "settimeofday" }, /* 79 */
118+ { 2, 0, sys_getgroups, "getgroups" }, /* 80 */
119+ { 2, 0, sys_setgroups, "setgroups" }, /* 81 */
120+ { 1, 0, sys_oldselect, "oldselect" }, /* 82 */
121+ { 2, TF, sys_symlink, "symlink" }, /* 83 */
122+ { 2, TF, sys_oldlstat, "oldlstat" }, /* 84 */
123+ { 3, TF, sys_readlink, "readlink" }, /* 85 */
124+ { 1, TF, sys_uselib, "uselib" }, /* 86 */
125+ { 1, TF, sys_swapon, "swapon" }, /* 87 */
126+ { 3, 0, sys_reboot, "reboot" }, /* 88 */
127+ { 3, 0, sys_readdir, "readdir" }, /* 89 */
128+ { 6, 0, sys_old_mmap, "old_mmap" }, /* 90 */
129+ { 2, 0, sys_munmap, "munmap" }, /* 91 */
130+ { 2, TF, sys_truncate, "truncate" }, /* 92 */
131+ { 2, 0, sys_ftruncate, "ftruncate" }, /* 93 */
132+ { 2, 0, sys_fchmod, "fchmod" }, /* 94 */
133+ { 3, 0, sys_fchown, "fchown" }, /* 95 */
134+ { 2, 0, sys_getpriority, "getpriority" }, /* 96 */
135+ { 3, 0, sys_setpriority, "setpriority" }, /* 97 */
136+ { 4, 0, sys_profil, "profil" }, /* 98 */
137+ { 2, TF, sys_statfs, "statfs" }, /* 99 */
138+ { 2, 0, sys_fstatfs, "fstatfs" }, /* 100 */
139+ { 3, 0, sys_ioperm, "ioperm" }, /* 101 */
140+ { 2, 0, sys_socketcall, "socketcall" }, /* 102 */
141+ { 3, 0, sys_syslog, "syslog" }, /* 103 */
142+ { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
143+ { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
144+ { 2, TF, sys_stat, "stat" }, /* 106 */
145+ { 2, TF, sys_lstat, "lstat" }, /* 107 */
146+ { 2, 0, sys_fstat, "fstat" }, /* 108 */
147+ { 1, 0, sys_olduname, "olduname" }, /* 109 */
148+ { 1, 0, sys_iopl, "iopl" }, /* 110 */
149+ { 0, 0, sys_vhangup, "vhangup" }, /* 111 */
150+ { 0, 0, sys_idle, "idle" }, /* 112 */
151+ { 1, 0, sys_vm86old, "vm86old" }, /* 113 */
152+ { 4, TP, sys_wait4, "wait4" }, /* 114 */
153+ { 1, 0, sys_swapoff, "swapoff" }, /* 115 */
154+ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */
155+ { 6, 0, sys_ipc, "ipc" }, /* 117 */
156+ { 1, 0, sys_fsync, "fsync" }, /* 118 */
157+ { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
158+ { 5, TP, sys_clone, "clone" }, /* 120 */
159+ { 2, 0, sys_setdomainname, "setdomainname" }, /* 121 */
160+ { 1, 0, sys_uname, "uname" }, /* 122 */
161+#ifdef M68K
162+ { 4, 0, sys_cacheflush, "cacheflush" }, /* 123 */
163+#else
164+ { 3, 0, sys_modify_ldt, "modify_ldt" }, /* 123 */
165+#endif
166+ { 1, 0, sys_adjtimex, "adjtimex" }, /* 124 */
167+ { 3, 0, sys_mprotect, "mprotect" }, /* 125 */
168+ { 3, TS, sys_sigprocmask, "sigprocmask" }, /* 126 */
169+ { 2, 0, sys_create_module, "create_module" }, /* 127 */
170+ { 2, 0, sys_init_module, "init_module" }, /* 128 */
171+ { 1, 0, sys_delete_module, "delete_module" }, /* 129 */
172+ { 1, 0, sys_get_kernel_syms, "get_kernel_syms"}, /* 130 */
173+ { 4, 0, sys_quotactl, "quotactl" }, /* 131 */
174+ { 1, 0, sys_getpgid, "getpgid" }, /* 132 */
175+ { 1, 0, sys_fchdir, "fchdir" }, /* 133 */
176+ { 0, 0, sys_bdflush, "bdflush" }, /* 134 */
177+ { 3, 0, sys_sysfs, "sysfs" }, /* 135 */
178+ { 1, 0, sys_personality, "personality" }, /* 136 */
179+ { 5, 0, sys_afs_syscall, "afs_syscall" }, /* 137 */
180+ { 1, 0, sys_setfsuid, "setfsuid" }, /* 138 */
181+ { 1, 0, sys_setfsgid, "setfsgid" }, /* 139 */
182+ { 5, 0, sys_llseek, "_llseek" }, /* 140 */
183+ { 3, 0, sys_getdents, "getdents" }, /* 141 */
184+ { 5, 0, sys_select, "select" }, /* 142 */
185+ { 2, 0, sys_flock, "flock" }, /* 143 */
186+ { 3, 0, sys_msync, "msync" }, /* 144 */
187+ { 3, 0, sys_readv, "readv" }, /* 145 */
188+ { 3, 0, sys_writev, "writev" }, /* 146 */
189+ { 1, 0, sys_getsid, "getsid" }, /* 147 */
190+ { 1, 0, sys_fdatasync, "fdatasync" }, /* 148 */
191+ { 1, 0, sys_sysctl, "_sysctl" }, /* 149 */
192+ { 2, 0, sys_mlock, "mlock" }, /* 150 */
193+ { 2, 0, sys_munlock, "munlock" }, /* 151 */
194+ { 2, 0, sys_mlockall, "mlockall" }, /* 152 */
195+ { 0, 0, sys_munlockall, "munlockall" }, /* 153 */
196+ { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 154 */
197+ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 155 */
198+ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 156 */
199+ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 157 */
200+ { 0, 0, sys_sched_yield, "sched_yield"}, /* 158 */
201+ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
202+ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
203+ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
204+ { 2, 0, sys_nanosleep, "nanosleep" }, /* 162 */
205+ { 4, 0, sys_mremap, "mremap" }, /* 163 */
206+ { 3, 0, sys_setresuid, "setresuid" }, /* 164 */
207+ { 3, 0, sys_getresuid, "getresuid" }, /* 165 */
208+#ifdef M68K
209+ { 5, 0, printargs, "SYS_166" }, /* 166 */
210+#else
211+ { 5, 0, printargs, "vm86" }, /* 166 */
212+#endif
213+ { 5, 0, sys_query_module, "query_module" }, /* 167 */
214+ { 3, 0, sys_poll, "poll" }, /* 168 */
215+ { 3, 0, printargs, "nfsservctl" }, /* 169 */
216+ { 3, 0, sys_setresgid, "setresgid" }, /* 170 */
217+ { 3, 0, sys_getresgid, "getresgid" }, /* 171 */
218+ { 5, 0, printargs, "prctl" }, /* 172 */
219+ { 1, TS, printargs, "rt_sigreturn" }, /* 173 */
220+ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 174 */
221+ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 175 */
222+ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 176 */
223+ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 177 */
224+ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 178 */
225+ { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 179 */
226+
227+ { 5, TF, sys_pread, "pread" }, /* 180 */
228+ { 5, TF, sys_pwrite, "pwrite" }, /* 181 */
229+#ifdef M68K
230+ { 3, TF, sys_chown, "lchown" }, /* 182 */
231+#else
232+ { 3, TF, sys_chown, "chown" }, /* 182 */
233+#endif
234+ { 2, TF, sys_getcwd, "getcwd" }, /* 183 */
235+ { 2, 0, sys_capget, "capget" }, /* 184 */
236+ { 2, 0, sys_capset, "capset" }, /* 185 */
237+ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 186 */
238+ { 4, TF, sys_sendfile, "sendfile" }, /* 187 */
239+ { 5, 0, sys_getpmsg, "getpmsg" }, /* 188 */
240+ { 5, 0, sys_putpmsg, "putpmsg" }, /* 189 */
241+ { 0, TP, sys_vfork, "vfork" }, /* 190 */
242+ { 2, 0, sys_getrlimit, "getrlimit" }, /* 191 */
243+ { 6, 0, sys_mmap, "mmap2" }, /* 192 */
244+ { 3, TF, sys_truncate64, "truncate64" }, /* 193 */
245+ { 3, TF, sys_ftruncate64, "ftruncate64" }, /* 194 */
246+ { 2, TF, sys_stat64, "stat64" }, /* 195 */
247+ { 2, TF, sys_lstat64, "lstat64" }, /* 196 */
248+ { 2, TF, sys_fstat64, "fstat64" }, /* 197 */
249+ { 3, TF, sys_chown, "lchown32" }, /* 198 */
250+ { 0, 0, sys_getuid, "getuid32" }, /* 199 */
251+
252+ { 0, 0, sys_getgid, "getgid32" }, /* 200 */
253+ { 0, 0, sys_geteuid, "geteuid32" }, /* 201 */
254+ { 0, 0, sys_geteuid, "getegid32" }, /* 202 */
255+ { 2, 0, sys_setreuid, "setreuid32" }, /* 203 */
256+ { 2, 0, sys_setregid, "setregid32" }, /* 204 */
257+ { 2, 0, sys_getgroups32, "getgroups32" }, /* 205 */
258+ { 2, 0, sys_setgroups32, "setgroups32" }, /* 206 */
259+ { 3, 0, sys_fchown, "fchown32" }, /* 207 */
260+ { 3, 0, sys_setresuid, "setresuid32" }, /* 208 */
261+ { 3, 0, sys_getresuid, "getresuid32" }, /* 209 */
262+ { 3, 0, sys_setresgid, "setresgid32" }, /* 210 */
263+ { 3, 0, sys_getresgid, "getresgid32" }, /* 211 */
264+ { 3, TF, sys_chown, "chown32" }, /* 212 */
265+ { 1, 0, sys_setuid, "setuid32" }, /* 213 */
266+ { 1, 0, sys_setgid, "setgid32" }, /* 214 */
267+ { 1, 0, sys_setfsuid, "setfsuid32" }, /* 215 */
268+ { 1, 0, sys_setfsgid, "setfsgid32" }, /* 216 */
269+ { 4, 0, sys_getdents64, "getdents64" }, /* 217 */
270+ { 2, TF, sys_pivotroot, "pivot_root" }, /* 218 */
271+ { 3, 0, printargs, "mincore" }, /* 219 */
272+ { 3, 0, sys_madvise, "madvise" }, /* 220 */
273+ { 3, 0, sys_fcntl, "fcntl64" }, /* 221 */
274+ { 4, 0, printargs, "SYS_222" }, /* 222 */
275+/*TODO*/{ 5, 0, printargs, "security" }, /* 223 */
276+ { 0, 0, printargs, "gettid" }, /* 224 */
277+ { 4, 0, sys_readahead, "readahead" }, /* 225 */
278+ { 5, TF, sys_setxattr, "setxattr" }, /* 226 */
279+ { 5, TF, sys_setxattr, "lsetxattr" }, /* 227 */
280+ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 228 */
281+ { 4, TF, sys_getxattr, "getxattr" }, /* 229 */
282+ { 4, TF, sys_getxattr, "lgetxattr" }, /* 230 */
283+ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 231 */
284+ { 3, TF, sys_listxattr, "listxattr" }, /* 232 */
285+ { 3, TF, sys_listxattr, "llistxattr" }, /* 233 */
286+ { 3, 0, sys_flistxattr, "flistxattr" }, /* 234 */
287+ { 2, TF, sys_removexattr, "removexattr" }, /* 235 */
288+ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */
289+ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 237 */
290+ { 2, TS, sys_kill, "tkill" }, /* 238 */
291+ { 4, TF, sys_sendfile64, "sendfile64" }, /* 239 */
292+ { 5, 0, sys_futex, "futex" }, /* 240 */
293+ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 241 */
294+ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 242 */
295+ { 1, 0, sys_set_thread_area, "set_thread_area" }, /* 243 */
296+ { 1, 0, sys_get_thread_area, "get_thread_area" }, /* 244 */
297+ { 2, 0, printargs, "io_setup" }, /* 245 */
298+ { 1, 0, printargs, "io_destroy" }, /* 246 */
299+ { 5, 0, printargs, "io_getevents" }, /* 247 */
300+ { 3, 0, printargs, "io_submit" }, /* 248 */
301+ { 3, 0, printargs, "io_cancel" }, /* 249 */
302+ { 5, 0, printargs, "SYS_250" }, /* 250 */
303+ { 5, 0, printargs, "SYS_251" }, /* 251 */
304+ { 1, TP, sys_exit, "exit_group" }, /* 252 */
305+ { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
306+ { 1, 0, printargs, "epoll_create" }, /* 254 */
307+ { 4, 0, printargs, "epoll_ctl" }, /* 255 */
308+ { 4, 0, printargs, "epoll_wait" }, /* 256 */
309+ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 257 */
310+ { 1, 0, printargs, "set_tid_address"}, /* 258 */
311+ { 3, 0, sys_timer_create, "timer_create" }, /* 259 */
312+ { 4, 0, sys_timer_settime, "timer_settime" }, /* 260 */
313+ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 261 */
314+ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 262 */
315+ { 1, 0, sys_timer_delete, "timer_delete" }, /* 263 */
316+ { 2, 0, sys_clock_settime, "clock_settime" }, /* 264 */
317+ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 265 */
318+ { 2, 0, sys_clock_getres, "clock_getres" }, /* 266 */
319+ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 267 */
320+ { 3, TF, sys_statfs64, "statfs64" }, /* 268 */
321+ { 3, 0, sys_fstatfs64, "fstatfs64" }, /* 269 */
322+ { 3, TS, sys_tgkill, "tgkill" }, /* 270 */
323+ { 2, TF, sys_utimes, "utimes" }, /* 271 */
324+ { 5, 0, printargs, "SYS_272" }, /* 272 */
325+ { 5, 0, printargs, "SYS_273" }, /* 273 */
326+ { 5, 0, printargs, "SYS_274" }, /* 274 */
327+ { 5, 0, printargs, "SYS_275" }, /* 275 */
328+ { 5, 0, printargs, "SYS_276" }, /* 276 */
329+ { 4, 0, sys_mq_open, "mq_open" }, /* 277 */
330+ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 278 */
331+ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 279 */
332+ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 280 */
333+ { 2, 0, sys_mq_notify, "mq_notify" }, /* 281 */
334+ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 282 */
335+ { 5, 0, printargs, "SYS_283" }, /* 283 */
336+ { 5, 0, printargs, "SYS_284" }, /* 284 */
337+ { 5, 0, printargs, "SYS_285" }, /* 285 */
338+ { 5, 0, printargs, "SYS_286" }, /* 286 */
339+ { 5, 0, printargs, "SYS_287" }, /* 287 */
340+ { 5, 0, printargs, "SYS_288" }, /* 288 */
341+ { 5, 0, printargs, "SYS_289" }, /* 289 */
342+ { 5, 0, printargs, "SYS_290" }, /* 290 */
343+ { 5, 0, printargs, "SYS_291" }, /* 291 */
344+ { 5, 0, printargs, "SYS_292" }, /* 292 */
345+ { 5, 0, printargs, "SYS_293" }, /* 293 */
346+ { 5, 0, printargs, "SYS_294" }, /* 294 */
347+ { 5, 0, printargs, "SYS_295" }, /* 295 */
348+ { 5, 0, printargs, "SYS_296" }, /* 296 */
349+ { 5, 0, printargs, "SYS_297" }, /* 297 */
350+ { 5, 0, printargs, "SYS_298" }, /* 298 */
351+ { 5, 0, printargs, "SYS_299" }, /* 299 */
352+
353+#if SYS_socket_subcall != 300 && !defined X86_64 /* pers1 broken on x86-64 */
354+ #error fix me
355+#endif
356+ { 8, 0, printargs, "socket_subcall"}, /* 300 */
357+ { 3, TN, sys_socket, "socket" }, /* 301 */
358+ { 3, TN, sys_bind, "bind" }, /* 302 */
359+ { 3, TN, sys_connect, "connect" }, /* 303 */
360+ { 2, TN, sys_listen, "listen" }, /* 304 */
361+ { 3, TN, sys_accept, "accept" }, /* 305 */
362+ { 3, TN, sys_getsockname, "getsockname" }, /* 306 */
363+ { 3, TN, sys_getpeername, "getpeername" }, /* 307 */
364+ { 4, TN, sys_socketpair, "socketpair" }, /* 308 */
365+ { 4, TN, sys_send, "send" }, /* 309 */
366+ { 4, TN, sys_recv, "recv" }, /* 310 */
367+ { 6, TN, sys_sendto, "sendto" }, /* 311 */
368+ { 6, TN, sys_recvfrom, "recvfrom" }, /* 312 */
369+ { 2, TN, sys_shutdown, "shutdown" }, /* 313 */
370+ { 5, TN, sys_setsockopt, "setsockopt" }, /* 314 */
371+ { 5, TN, sys_getsockopt, "getsockopt" }, /* 315 */
372+ { 5, TN, sys_sendmsg, "sendmsg" }, /* 316 */
373+ { 5, TN, sys_recvmsg, "recvmsg" }, /* 317 */
374+
375+#if SYS_ipc_subcall != 318 && !defined X86_64 /* pers1 broken on x86-64 */
376+ #error fix me
377+#endif
378+ { 4, 0, printargs, "ipc_subcall" }, /* 318 */
379+ { 4, TI, sys_semop, "semop" }, /* 319 */
380+ { 4, TI, sys_semget, "semget" }, /* 320 */
381+ { 4, TI, sys_semctl, "semctl" }, /* 321 */
382+ { 5, TI, sys_semtimedop, "semtimedop" }, /* 322 */
383+ { 4, 0, printargs, "ipc_subcall" }, /* 323 */
384+ { 4, 0, printargs, "ipc_subcall" }, /* 324 */
385+ { 4, 0, printargs, "ipc_subcall" }, /* 325 */
386+ { 4, 0, printargs, "ipc_subcall" }, /* 326 */
387+ { 4, 0, printargs, "ipc_subcall" }, /* 327 */
388+ { 4, 0, printargs, "ipc_subcall" }, /* 328 */
389+ { 4, TI, sys_msgsnd, "msgsnd" }, /* 329 */
390+ { 4, TI, sys_msgrcv, "msgrcv" }, /* 330 */
391+ { 4, TI, sys_msgget, "msgget" }, /* 331 */
392+ { 4, TI, sys_msgctl, "msgctl" }, /* 332 */
393+ { 4, 0, printargs, "ipc_subcall" }, /* 333 */
394+ { 4, 0, printargs, "ipc_subcall" }, /* 334 */
395+ { 4, 0, printargs, "ipc_subcall" }, /* 335 */
396+ { 4, 0, printargs, "ipc_subcall" }, /* 336 */
397+ { 4, 0, printargs, "ipc_subcall" }, /* 337 */
398+ { 4, 0, printargs, "ipc_subcall" }, /* 338 */
399+ { 4, TI, sys_shmat, "shmat" }, /* 339 */
400+ { 4, TI, sys_shmdt, "shmdt" }, /* 340 */
401+ { 4, TI, sys_shmget, "shmget" }, /* 341 */
402+ { 4, TI, sys_shmctl, "shmctl" }, /* 342 */
diff --git a/meta/packages/strace/strace/linux-headers-fix.patch b/meta/packages/strace/strace/linux-headers-fix.patch
deleted file mode 100644
index 911950f912..0000000000
--- a/meta/packages/strace/strace/linux-headers-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Origin: Debian 4.5.15-1.1 diff
2
3--- strace-4.5.15.orig/configure.ac
4+++ strace-4.5.15/configure.ac
5@@ -194,7 +194,9 @@
6 AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
7 AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h inttypes.h], [], [])
8 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
9- [], [], [#include <linux/socket.h>])
10+ [], [],
11+[#include <stddef.h>
12+#include <linux/socket.h>])
13 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
14 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
15
diff --git a/meta/packages/strace/strace_4.5.14.bb b/meta/packages/strace/strace_4.5.14.bb
deleted file mode 100644
index 50baef86dc..0000000000
--- a/meta/packages/strace/strace_4.5.14.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1DESCRIPTION = "strace is a system call tracing tool."
2SECTION = "console/utils"
3LICENSE = "GPL"
4PR = "r4"
5
6SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
7 file://glibc-2.5.patch;patch=1 \
8 file://arm-eabi.patch;patch=1 \
9 file://drop-ctl-proc.patch;patch=1 \
10 file://sh-arch-update.patch;patch=1 \
11 file://sh-syscall-update.patch;patch=1 \
12 file://strace-fix-arm-bad-syscall.patch;patch=1 \
13 file://strace-undef-syscall.patch;patch=1 "
14
15inherit autotools
16
17export INCLUDES = "-I. -I./linux"
diff --git a/meta/packages/strace/strace_4.5.15.bb b/meta/packages/strace/strace_4.5.18.bb
index 10f705a683..59add6abb4 100644
--- a/meta/packages/strace/strace_4.5.15.bb
+++ b/meta/packages/strace/strace_4.5.18.bb
@@ -1,15 +1,12 @@
1DESCRIPTION = "strace is a system call tracing tool." 1DESCRIPTION = "strace is a system call tracing tool."
2SECTION = "console/utils" 2SECTION = "console/utils"
3LICENSE = "GPL" 3LICENSE = "GPL"
4PR = "r1" 4PR = "r0"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ 6SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
7 file://strace-fix-arm-bad-syscall.patch;patch=1 \ 7 file://strace-fix-arm-bad-syscall.patch;patch=1 \
8 file://strace-undef-syscall.patch;patch=1 \ 8 file://strace-undef-syscall.patch;patch=1 \
9 file://linux-headers-fix.patch;patch=1" 9 file://arm_syscall_fix.patch;patch=1 "
10# TODO file://sh-arch-update.patch;patch=1 \
11# TODO file://sh-syscall-update.patch;patch=1 \
12
13inherit autotools 10inherit autotools
14 11
15export INCLUDES = "-I. -I./linux" 12export INCLUDES = "-I. -I./linux"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 10:55:28 +0000