summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-07 04:24:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:22 +0100
commit5169721033ca1c2d9a9721761930d668fa1e70ba (patch)
tree0932752be91cd4384c0971302c4ec3bc87625074 /meta
parent6cd8c8d7466cdf29e7a94ebd4978b129da4455fa (diff)
downloadpoky-5169721033ca1c2d9a9721761930d668fa1e70ba.tar.gz
strace: 4.9 -> 4.10
Updated patches: Makefile-ptest.patch strace-add-configure-options.patch Fixed: debugedit: netlink_unix_diag: canonicalization unexpectedly shrank by one character It was because oe_runmake -C ${TESTDIR} buildtest-TESTS didn't set OS and ARCH, which caused "-I<foo>//" in gcc options, and would cause debugedit error. (From OE-Core rev: af76eb0405352d66dfd00d7f856f401d892855e1) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch (renamed from meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch)8
-rwxr-xr-xmeta/recipes-devtools/strace/strace/git-version-gen (renamed from meta/recipes-devtools/strace/strace-4.9/git-version-gen)0
-rwxr-xr-xmeta/recipes-devtools/strace/strace/run-ptest (renamed from meta/recipes-devtools/strace/strace-4.9/run-ptest)0
-rw-r--r--meta/recipes-devtools/strace/strace/strace-add-configure-options.patch (renamed from meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch)24
-rw-r--r--meta/recipes-devtools/strace/strace_4.10.bb (renamed from meta/recipes-devtools/strace/strace_4.9.bb)8
5 files changed, 15 insertions, 25 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index df013102d7..f3603012f4 100644
--- a/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -10,7 +10,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
10 2 files changed, 19 insertions(+), 1 deletion(-) 10 2 files changed, 19 insertions(+), 1 deletion(-)
11 11
12diff --git a/configure.ac b/configure.ac 12diff --git a/configure.ac b/configure.ac
13index 054f85b..9aec566 100644 13index e73958c..5f0dfee 100644
14--- a/configure.ac 14--- a/configure.ac
15+++ b/configure.ac 15+++ b/configure.ac
16@@ -6,7 +6,7 @@ AC_INIT([strace], 16@@ -6,7 +6,7 @@ AC_INIT([strace],
@@ -23,11 +23,11 @@ index 054f85b..9aec566 100644
23 AC_CANONICAL_HOST 23 AC_CANONICAL_HOST
24 24
25diff --git a/tests/Makefile.am b/tests/Makefile.am 25diff --git a/tests/Makefile.am b/tests/Makefile.am
26index 922452a..b17837f 100644 26index ff5e136..984bdb6 100644
27--- a/tests/Makefile.am 27--- a/tests/Makefile.am
28+++ b/tests/Makefile.am 28+++ b/tests/Makefile.am
29@@ -37,3 +37,21 @@ TEST_LOG_COMPILER = $(srcdir)/run.sh 29@@ -101,3 +101,21 @@ EXTRA_DIST = init.sh run.sh \
30 EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS) 30 $(TESTS)
31 31
32 CLEANFILES = $(TESTS:=.tmp) 32 CLEANFILES = $(TESTS:=.tmp)
33+ 33+
diff --git a/meta/recipes-devtools/strace/strace-4.9/git-version-gen b/meta/recipes-devtools/strace/strace/git-version-gen
index 8fee74e121..8fee74e121 100755
--- a/meta/recipes-devtools/strace/strace-4.9/git-version-gen
+++ b/meta/recipes-devtools/strace/strace/git-version-gen
diff --git a/meta/recipes-devtools/strace/strace-4.9/run-ptest b/meta/recipes-devtools/strace/strace/run-ptest
index 133cf92d02..133cf92d02 100755
--- a/meta/recipes-devtools/strace/strace-4.9/run-ptest
+++ b/meta/recipes-devtools/strace/strace/run-ptest
diff --git a/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
index 15e37bce03..e48e4b31b9 100644
--- a/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch
+++ b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
@@ -5,24 +5,16 @@ Upstream-Status: Pending
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> 6Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
7--- 7---
8 configure.ac | 27 ++++++++++++++++++++++++++- 8 configure.ac | 26 ++++++++++++++++++++++++++
9 1 file changed, 26 insertions(+), 1 deletion(-) 9 1 file changed, 26 insertions(+)
10 10
11diff --git a/configure.ac b/configure.ac 11diff --git a/configure.ac b/configure.ac
12index 054f85b..8ed49f1 100644 12index e73958c..9099370 100644
13--- a/configure.ac 13--- a/configure.ac
14+++ b/configure.ac 14+++ b/configure.ac
15@@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([ 15@@ -270,6 +270,18 @@ AC_CHECK_HEADERS(m4_normalize([
16 poll.h
17 scsi/sg.h
18 stropts.h
19- sys/acl.h
20 sys/asynch.h
21 sys/conf.h
22 sys/epoll.h
23@@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([
24 sys/uio.h
25 sys/vfs.h 16 sys/vfs.h
17 sys/xattr.h
26 ])) 18 ]))
27+ 19+
28+AC_ARG_ENABLE([acl], 20+AC_ARG_ENABLE([acl],
@@ -39,9 +31,9 @@ index 054f85b..8ed49f1 100644
39 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], 31 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
40 [], [], [#include <stddef.h> 32 [], [], [#include <stddef.h>
41 #include <sys/socket.h> 33 #include <sys/socket.h>
42@@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then 34@@ -745,6 +757,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then
43 [Define to 1 if the system provides __builtin_popcount function])
44 fi 35 fi
36 AC_SUBST(dl_LIBS)
45 37
46+AC_ARG_ENABLE([aio], 38+AC_ARG_ENABLE([aio],
47+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])], 39+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])],
@@ -60,6 +52,6 @@ index 054f85b..8ed49f1 100644
60 AC_PATH_PROG([PERL], [perl]) 52 AC_PATH_PROG([PERL], [perl])
61 53
62 dnl stack trace with libunwind 54 dnl stack trace with libunwind
63-- 55--
641.9.1 561.9.1
65 57
diff --git a/meta/recipes-devtools/strace/strace_4.9.bb b/meta/recipes-devtools/strace/strace_4.10.bb
index cce130d58c..416c38756a 100644
--- a/meta/recipes-devtools/strace/strace_4.9.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
11 file://run-ptest \ 11 file://run-ptest \
12 " 12 "
13 13
14SRC_URI[md5sum] = "885eafadb10f6c60464a266d3929a2a4" 14SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912"
15SRC_URI[sha256sum] = "095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65" 15SRC_URI[sha256sum] = "e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2"
16 16
17inherit autotools ptest 17inherit autotools ptest
18RDEPENDS_${PN}-ptest += "make coreutils grep gawk" 18RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
@@ -23,8 +23,6 @@ PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
23PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" 23PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
24PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind" 24PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
25 25
26export INCLUDES = "-I. -I./linux"
27
28TESTDIR = "tests" 26TESTDIR = "tests"
29 27
30do_configure_prepend() { 28do_configure_prepend() {
@@ -37,7 +35,7 @@ do_install_append() {
37} 35}
38 36
39do_compile_ptest() { 37do_compile_ptest() {
40 oe_runmake -C ${TESTDIR} buildtest-TESTS 38 oe_runmake -C ${TESTDIR} buildtest-TESTS OS=linux ARCH="${TARGET_ARCH}"
41} 39}
42 40
43do_install_ptest() { 41do_install_ptest() {