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