summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-09-30 17:33:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:23 +0000
commit24ad27878c404493d01bc8cdffaad5634f854330 (patch)
treefb6954c734dc5d0884ce1165564cbb4a03fab32e /meta/recipes-devtools
parentbfe16dbb3c237992a4d5bfc0bbd249257c3b9aff (diff)
downloadpoky-24ad27878c404493d01bc8cdffaad5634f854330.tar.gz
strace: Upgrade to 4.9
Remove two backported patches: 0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch strace-fix-64-bit-process-detection.patch Update two patches to fit new version: Makefile-ptest.patch strace-add-configure-options.patch Add coreutils, grep and gawk to RDEPENDS_${PN}-ptest for making ptest pass. (From OE-Core rev: 826e36643a3fcb8b4ee4ed79612c63c3a9cc1536) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch108
-rw-r--r--meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch34
-rw-r--r--meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch (renamed from meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch)44
-rwxr-xr-xmeta/recipes-devtools/strace/strace-4.9/git-version-gen (renamed from meta/recipes-devtools/strace/strace-4.8/git-version-gen)0
-rwxr-xr-xmeta/recipes-devtools/strace/strace-4.9/run-ptest (renamed from meta/recipes-devtools/strace/strace-4.8/run-ptest)0
-rw-r--r--meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch (renamed from meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch)37
-rw-r--r--meta/recipes-devtools/strace/strace_4.9.bb (renamed from meta/recipes-devtools/strace/strace_4.8.bb)8
7 files changed, 52 insertions, 179 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch b/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
deleted file mode 100644
index 5a0090eb6d..0000000000
--- a/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
+++ /dev/null
@@ -1,108 +0,0 @@
1Upstream-Status: Backport
2
3From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001
4From: Ali Polatel <alip@exherbo.org>
5Date: Tue, 24 Sep 2013 20:04:32 +0300
6Subject: [PATCH] Work around conflict between <sys/ptrace.h> and
7 <linux/ptrace.h>
8
9Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
10which collides with <linux/ptrace.h>.
11
12* configure.ac: Check for `struct ptrace_peeksiginfo_args' in
13<sys/ptrace.h>.
14* process.c: Work around potential conflict between <sys/ptrace.h>
15and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
16* signal.c: Likewise.
17* syscall.c: Likewise.
18* util.c: Likewise.
19
20Signed-off-by: Ali Polatel <alip@exherbo.org>
21---
22 configure.ac | 2 +-
23 process.c | 4 ++++
24 signal.c | 4 ++++
25 syscall.c | 4 ++++
26 util.c | 4 ++++
27 5 files changed, 17 insertions(+), 1 deletion(-)
28
29diff --git a/configure.ac b/configure.ac
30index f19e4f2..aa4923a 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
34
35 AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
36
37-AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
38+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,,
39 [#include <sys/ptrace.h>])
40
41 AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>])
42diff --git a/process.c b/process.c
43index 1a2181b..59428a4 100644
44--- a/process.c
45+++ b/process.c
46@@ -63,7 +63,11 @@
47 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
48 # define pt_all_user_regs XXX_pt_all_user_regs
49 # endif
50+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
51+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
52+# endif
53 # include <linux/ptrace.h>
54+# undef ptrace_peeksiginfo_args
55 # undef ia64_fpreg
56 # undef pt_all_user_regs
57 #endif
58diff --git a/signal.c b/signal.c
59index 7fb9abf..3411ddd 100644
60--- a/signal.c
61+++ b/signal.c
62@@ -51,7 +51,11 @@
63 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
64 # define pt_all_user_regs XXX_pt_all_user_regs
65 # endif
66+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
67+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
68+# endif
69 # include <linux/ptrace.h>
70+# undef ptrace_peeksiginfo_args
71 # undef ia64_fpreg
72 # undef pt_all_user_regs
73 #endif
74diff --git a/syscall.c b/syscall.c
75index 83a95bd..3477dcd 100644
76--- a/syscall.c
77+++ b/syscall.c
78@@ -48,7 +48,11 @@
79 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
80 # define pt_all_user_regs XXX_pt_all_user_regs
81 # endif
82+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
83+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
84+# endif
85 # include <linux/ptrace.h>
86+# undef ptrace_peeksiginfo_args
87 # undef ia64_fpreg
88 # undef pt_all_user_regs
89 #endif
90diff --git a/util.c b/util.c
91index 0dab902..30a7f19 100644
92--- a/util.c
93+++ b/util.c
94@@ -55,7 +55,11 @@
95 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
96 # define pt_all_user_regs XXX_pt_all_user_regs
97 # endif
98+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
99+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
100+# endif
101 # include <linux/ptrace.h>
102+# undef ptrace_peeksiginfo_args
103 # undef ia64_fpreg
104 # undef pt_all_user_regs
105 #endif
106--
1071.8.2.1
108
diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch b/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch
deleted file mode 100644
index a6579df598..0000000000
--- a/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1powerpc64: fix 64-bit process detection on embedded
2
3* syscall.c (get_scno) [POWERPC64]: Fix 64-bit process detection
4on embedded powerpc.
5
6Upstream-Status: Backport
7
8Signed-off-by: James Yang <james.yang@freescale.com>
9Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
10
11diff --git a/syscall.c.orig b/syscall.c
12index 7efee0e..72d9453 100644
13--- a/syscall.c.orig
14+++ b/syscall.c
15@@ -1207,11 +1207,14 @@ get_scno(struct tcb *tcp)
16 /* Check for 64/32 bit mode. */
17 if (upeek(tcp, sizeof(unsigned long)*PT_MSR, &val) < 0)
18 return -1;
19- /* SF is bit 0 of MSR */
20- if (val < 0)
21- currpers = 0;
22- else
23- currpers = 1;
24+
25+ /*
26+ * Check for 64/32 bit mode.
27+ * Embedded implementations covered by Book E extension of PPC use
28+ * bit 0 (CM) of 32-bit Machine state register (MSR).
29+ * Other implementations use bit 0 (SF) of 64-bit MSR.
30+ */
31+ currpers = (val & 0x8000000080000000) ? 0 : 1;
32 update_personality(tcp, currpers);
33 # endif
34 #elif defined(AVR32)
diff --git a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch
index 3a0eb39375..df013102d7 100644
--- a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch
@@ -4,13 +4,32 @@ Upstream-Status: Inappropriate
4 4
5Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> 5Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
6Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 6Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
7---
8 configure.ac | 2 +-
9 tests/Makefile.am | 18 ++++++++++++++++++
10 2 files changed, 19 insertions(+), 1 deletion(-)
7 11
8--- old/tests/Makefile.am 2013-07-23 13:44:24.660481381 +0200 12diff --git a/configure.ac b/configure.ac
9+++ new/tests/Makefile.am 2013-07-23 16:22:42.937654391 +0200 13index 054f85b..9aec566 100644
10@@ -9,3 +9,21 @@ 14--- a/configure.ac
11 EXTRA_DIST = init.sh $(TESTS) 15+++ b/configure.ac
16@@ -6,7 +6,7 @@ AC_INIT([strace],
17 AC_CONFIG_SRCDIR([strace.c])
18 AC_CONFIG_AUX_DIR([.])
19 AC_CONFIG_HEADERS([config.h])
20-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests])
21+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests])
22 AM_MAINTAINER_MODE
23 AC_CANONICAL_HOST
24
25diff --git a/tests/Makefile.am b/tests/Makefile.am
26index 922452a..b17837f 100644
27--- a/tests/Makefile.am
28+++ b/tests/Makefile.am
29@@ -37,3 +37,21 @@ TEST_LOG_COMPILER = $(srcdir)/run.sh
30 EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS)
12 31
13 CLEANFILES = check.log 32 CLEANFILES = $(TESTS:=.tmp)
14+ 33+
15+buildtest-TESTS: $(check_PROGRAMS) $(TESTS) 34+buildtest-TESTS: $(check_PROGRAMS) $(TESTS)
16+ 35+
@@ -28,14 +47,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
28+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ 47+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \
29+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ 48+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
30+ done 49+ done
31+ sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net 50+ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done
32--- a/configure.ac 51--
33+++ b/configure.ac 521.9.1
34@@ -6,7 +6,7 @@ AC_INIT([strace], 53
35 AC_CONFIG_SRCDIR([strace.c])
36 AC_CONFIG_AUX_DIR([.])
37 AC_CONFIG_HEADERS([config.h])
38-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules])
39+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests])
40 AM_MAINTAINER_MODE
41 AC_CANONICAL_HOST
diff --git a/meta/recipes-devtools/strace/strace-4.8/git-version-gen b/meta/recipes-devtools/strace/strace-4.9/git-version-gen
index 8fee74e121..8fee74e121 100755
--- a/meta/recipes-devtools/strace/strace-4.8/git-version-gen
+++ b/meta/recipes-devtools/strace/strace-4.9/git-version-gen
diff --git a/meta/recipes-devtools/strace/strace-4.8/run-ptest b/meta/recipes-devtools/strace/strace-4.9/run-ptest
index 133cf92d02..133cf92d02 100755
--- a/meta/recipes-devtools/strace/strace-4.8/run-ptest
+++ b/meta/recipes-devtools/strace/strace-4.9/run-ptest
diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch
index 27266d9052..15e37bce03 100644
--- a/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch
+++ b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch
@@ -3,18 +3,24 @@ Add options "aio" and "acl" to enable/disable libaio and acl support.
3Upstream-Status: Pending 3Upstream-Status: Pending
4 4
5Signed-off-by: Kai Kang <kai.kang@windriver.com> 5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
7---
8 configure.ac | 27 ++++++++++++++++++++++++++-
9 1 file changed, 26 insertions(+), 1 deletion(-)
6 10
7--- strace-4.8/configure.ac.orig 2013-06-21 15:37:52.145892182 +0800 11diff --git a/configure.ac b/configure.ac
8+++ strace-4.8/configure.ac 2013-06-21 15:45:49.029909004 +0800 12index 054f85b..8ed49f1 100644
9@@ -219,7 +219,6 @@ AC_CHECK_HEADERS(m4_normalize([ 13--- a/configure.ac
10 netinet/sctp.h 14+++ b/configure.ac
15@@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([
11 poll.h 16 poll.h
17 scsi/sg.h
12 stropts.h 18 stropts.h
13- sys/acl.h 19- sys/acl.h
14 sys/asynch.h 20 sys/asynch.h
15 sys/conf.h 21 sys/conf.h
16 sys/epoll.h 22 sys/epoll.h
17@@ -231,6 +230,19 @@ AC_CHECK_HEADERS(m4_normalize([ 23@@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([
18 sys/uio.h 24 sys/uio.h
19 sys/vfs.h 25 sys/vfs.h
20 ])) 26 ]))
@@ -22,30 +28,25 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
22+AC_ARG_ENABLE([acl], 28+AC_ARG_ENABLE([acl],
23+ [AS_HELP_STRING([--enable-acl], [turn on acl support])], 29+ [AS_HELP_STRING([--enable-acl], [turn on acl support])],
24+ [case $enableval in 30+ [case $enableval in
25+ yes) 31+ yes)
26+ AC_CHECK_HEADERS([sys/acl.h]) 32+ AC_CHECK_HEADERS([sys/acl.h])
27+ ;; 33+ ;;
28+ no) ;; 34+ no) ;;
29+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; 35+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;;
30+ esac] 36+ esac]
31+
32+) 37+)
33+ 38+
34 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], 39 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
35 [], [], [#include <stddef.h> 40 [], [], [#include <stddef.h>
36 #include <sys/socket.h> 41 #include <sys/socket.h>
37@@ -301,10 +313,19 @@ AC_CHECK_SIZEOF([long]) 42@@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then
38 AC_CHECK_SIZEOF([long long]) 43 [Define to 1 if the system provides __builtin_popcount function])
39 AC_CHECK_SIZEOF([rlim_t],,[#include <sys/resource.h>]) 44 fi
40 45
41-AC_CHECK_HEADERS([libaio.h], [
42- AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>])
43- AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>])
44-])
45+AC_ARG_ENABLE([aio], 46+AC_ARG_ENABLE([aio],
46+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])], 47+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])],
47+ [case $enableval in 48+ [case $enableval in
48+ yes) 49+ yes)
49+ AC_CHECK_HEADERS([libaio.h], [ 50+ AC_CHECK_HEADERS([libaio.h], [
50+ AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) 51+ AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>])
51+ AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) 52+ AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>])
@@ -55,6 +56,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
55+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; 56+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;;
56+ esac] 57+ esac]
57+) 58+)
58 59+
59 AC_PATH_PROG([PERL], [perl]) 60 AC_PATH_PROG([PERL], [perl])
60 61
62 dnl stack trace with libunwind
63--
641.9.1
65
diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.9.bb
index ed738eaad7..f64c6ecac4 100644
--- a/meta/recipes-devtools/strace/strace_4.8.bb
+++ b/meta/recipes-devtools/strace/strace_4.9.bb
@@ -8,16 +8,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
8 file://git-version-gen \ 8 file://git-version-gen \
9 file://strace-add-configure-options.patch \ 9 file://strace-add-configure-options.patch \
10 file://Makefile-ptest.patch \ 10 file://Makefile-ptest.patch \
11 file://strace-fix-64-bit-process-detection.patch \
12 file://run-ptest \ 11 file://run-ptest \
13 file://0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch \
14 " 12 "
15 13
16SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" 14SRC_URI[md5sum] = "885eafadb10f6c60464a266d3929a2a4"
17SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8" 15SRC_URI[sha256sum] = "095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65"
18 16
19inherit autotools ptest 17inherit autotools ptest
20RDEPENDS_${PN}-ptest += "make" 18RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
21 19
22PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" 20PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
23 21