strace: update avr32 support

This patch includes patches from Atmel's AVR32 buildroot 2.1.0.
In fact, that's pretty much all it is.

2 files changed, 88 insertions, 4 deletions

diff --git a/packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch b/packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch
new file mode 100644
index 0000000000..78317ac942
--- /dev/null
+++ b/packages/strace/strace-4.5.14/strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch
@@ -0,0 +1,75 @@
+Index: strace-4.5.14/linux/avr32/syscallent.h
+===================================================================
+--- strace-4.5.14.orig/linux/avr32/syscallent.h	2007-02-19 07:48:12.000000000 +0100
++++ strace-4.5.14/linux/avr32/syscallent.h	2007-02-19 08:01:24.000000000 +0100
+@@ -251,4 +251,57 @@
+ 	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 221 */
+ 	{ 5,	0,	printargs,		"SYS_222"	}, /* 222 */
+ 	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 223 */
+-	{ 6,	0,	printargs,		"fadvise64_64"	}, /* 224 */
++	{ 6,	0,	sys_fadvise64_64,	"fadvise64_64"	}, /* 224 */
++	{ 3,	0,	printargs,		"cacheflush"	}, /* 225 */
++	{ 0,	0,	printargs,		"vserver"	}, /* 226 */
++	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 227 */
++	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 228 */
++	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 229 */
++	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 230 */
++	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 231 */
++	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr" }, /* 232 */
++	{ 4,	0,	printargs,		"kexec_load"	}, /* 233 */
++	{ 1,	0,	sys_waitid,		"waitid"	}, /* 234 */
++	{ 5,	0,	printargs,		"add_key"	}, /* 235 */
++	{ 4,	0,	printargs,		"request_key"	}, /* 236 */
++	{ 5,	0,	printargs,		"keyctl"	}, /* 237 */
++	{ 3,	0,	printargs,		"ioprio_set"	}, /* 238 */
++	{ 2,	0,	printargs,		"ioprio_get"	}, /* 239 */
++	{ 1,	0,	printargs,		"inotify_init"	}, /* 240 */
++	{ 3,	0,	printargs,		"inotify_add_watch" }, /* 241 */
++	{ 2,	0,	printargs,		"inotify_rm_watch" }, /* 242 */
++	{ 4,	0,	printargs,		"openat"	}, /* 243 */
++	{ 3,	0,	printargs,		"mkdirat"	}, /* 244 */
++	{ 4,	0,	printargs,		"mknodat"	}, /* 245 */
++	{ 5,	0,	printargs,		"fchownat"	}, /* 246 */
++	{ 3,	0,	printargs,		"futimesat"	}, /* 247 */
++	{ 4,	0,	sys_fstatfs64,		"fstatat64"	}, /* 248 */
++	{ 3,	0,	printargs,		"unlinkat"	}, /* 249 */
++	{ 4,	0,	printargs,		"renameat"	}, /* 250 */
++	{ 5,	0,	printargs,		"linkat"	}, /* 251 */
++	{ 3,	0,	printargs,		"symlinkat"	}, /* 252 */
++	{ 4,	0,	printargs,		"readlinkat"	}, /* 253 */
++	{ 3,	0,	printargs,		"fchmodat"	}, /* 254 */
++	{ 3,	0,	printargs,		"faccessat"	}, /* 255 */
++	{ 6,	0,	printargs,		"pselect6"	}, /* 256 */
++	{ 5,	0,	printargs,		"ppoll"		}, /* 257 */
++	{ 1,	0,	printargs,		"unshare"	}, /* 258 */
++	{ 2,	0,	printargs,		"set_robust_list" }, /* 259 */
++	{ 3,	0,	printargs,		"get_robust_list" }, /* 260 */
++	{ 6,	0,	printargs,		"splice"	}, /* 261 */
++	{ 4,	0,	printargs,		"sync_file_range" }, /* 262 */
++	{ 4,	0,	printargs,		"tee"		}, /* 263 */
++	{ 4,	0,	printargs,		"vmsplice"	}, /* 264 */
++	{ 6,	0,	printargs,		"sys_epoll_pwait" }, /* 265 */
++	{ 2,	TI,	sys_msgget,		"msgget"	}, /* 266 */
++	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 267 */
++	{ 5,	TI,	sys_msgrcv,		"msgrcv"	}, /* 268 */
++	{ 3,	TI,	sys_msgctl,		"msgctl"	}, /* 269 */
++	{ 3,	TI,	sys_semget,		"semget"	}, /* 270 */
++	{ 3,	TI,	sys_semop,		"semop"		}, /* 271 */
++	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 272 */
++	{ 4,	TI,	sys_semtimedop,		"semtimedop"	}, /* 273 */
++	{ 3,	TI,	sys_shmat,		"shmat"		}, /* 274 */
++	{ 3,	TI,	sys_shmget,		"shmget"	}, /* 275 */
++	{ 1,	TI,	sys_shmdt,		"shmdt"		}, /* 276 */
++	{ 3,	TI,	sys_shmctl,		"shmctl"	}, /* 277 */
+Index: strace-4.5.14/system.c
+===================================================================
+--- strace-4.5.14.orig/system.c	2007-02-19 07:48:12.000000000 +0100
++++ strace-4.5.14/system.c	2007-02-19 07:48:12.000000000 +0100
+@@ -1578,7 +1578,6 @@
+ 	{ CTL_KERN, "CTL_KERN" },
+ 	{ CTL_VM, "CTL_VM" },
+ 	{ CTL_NET, "CTL_NET" },
+-	/* was CTL_PROC */
+ 	{ CTL_FS, "CTL_FS" },
+ 	{ CTL_DEBUG, "CTL_DEBUG" },
+ 	{ CTL_DEV, "CTL_DEV" },
diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb
index f2838271ba..e65ac2d04e 100644
--- a/packages/strace/strace_4.5.14.bb
+++ b/packages/strace/strace_4.5.14.bb
@@ -12,11 +12,20 @@ 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 \
           "
+ 
+
+
+# The strace-4.5.14-avr32.patch conflicts with some other patches.
+# These patches are primarly for the ARM and SuperH, so we'll just
+# not use them when building for the AVR32.
+# The avr32 patch also includes the drop-ctl-proc.patch
+# The AVR32 patches are from http://avr32linux.org/twiki/bin/view/Main/STrace
+SRC_URI_avr32 = \
+    "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
+     file://strace-4.5.14-avr32.patch;patch=1 \
+     file://strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch;patch=1 \
+    "
 
-SRC_URI_avr32 = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-           file://strace-4.5.14-avr32.patch;patch=1 \
-           file://strace-4.5.14-add-syscalls-up-to-sysvipc.patch;patch=1 \  
-          "
 
 inherit autotools