summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-11-14 01:58:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 13:06:13 +0000
commit22125f0ace2c355f7118de4ae797338f5863ce7f (patch)
tree32cef2f4b35bd8ad4ae679acc165fbd4b86c8d4b /meta/recipes-devtools/strace
parentf955ef4758ec88a88084b9aafb7ce11ff9bf475e (diff)
downloadpoky-22125f0ace2c355f7118de4ae797338f5863ce7f.tar.gz
strace: 4.18 -> 4.19
Rebase Makefile-ptest.patch (From OE-Core rev: 481bceb3f23f55a537ad4bde8bf6226f60fdeb46) Signed-off-by: Robert Yang <liezhi.yang@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/strace')
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch17
-rw-r--r--meta/recipes-devtools/strace/strace_4.19.bb (renamed from meta/recipes-devtools/strace/strace_4.18.bb)4
2 files changed, 9 insertions, 12 deletions
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 97bcc90a88..a12f4c3e45 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -14,23 +14,23 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
14 2 files changed, 19 insertions(+), 1 deletion(-) 14 2 files changed, 19 insertions(+), 1 deletion(-)
15 15
16diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
17index 61d6425..6387c24 100644 17index 5f0aec4..8eaacc6 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -41,7 +41,7 @@ AC_COPYRIGHT([Copyright (C) 1999-]copyright_year[ The strace developers.]) 20@@ -42,7 +42,7 @@ AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.])
21 AC_CONFIG_SRCDIR([strace.c]) 21 AC_CONFIG_SRCDIR([strace.c])
22 AC_CONFIG_AUX_DIR([.]) 22 AC_CONFIG_AUX_DIR([.])
23 AC_CONFIG_HEADERS([config.h]) 23 AC_CONFIG_HEADERS([config.h])
24-AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests]) 24-AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests 1.13])
25+AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules serial-tests]) 25+AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules serial-tests 1.13])
26 AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
27 AM_MAINTAINER_MODE 26 AM_MAINTAINER_MODE
28 AC_CANONICAL_HOST 27 AC_CANONICAL_HOST
28
29diff --git a/tests/Makefile.am b/tests/Makefile.am 29diff --git a/tests/Makefile.am b/tests/Makefile.am
30index 5aa7f89..a55a355 100644 30index b4ba22a..5836438 100644
31--- a/tests/Makefile.am 31--- a/tests/Makefile.am
32+++ b/tests/Makefile.am 32+++ b/tests/Makefile.am
33@@ -379,3 +379,21 @@ clean-local-check: 33@@ -408,3 +408,21 @@ BUILT_SOURCES = ksysent.h
34 CLEANFILES = ksysent.h 34 CLEANFILES = ksysent.h
35 35
36 include ../scno.am 36 include ../scno.am
@@ -52,6 +52,3 @@ index 5aa7f89..a55a355 100644
52+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ 52+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
53+ done 53+ done
54+ for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done 54+ for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done
55--
562.13.2
57
diff --git a/meta/recipes-devtools/strace/strace_4.18.bb b/meta/recipes-devtools/strace/strace_4.19.bb
index 5b2891ad93..deccf3df76 100644
--- a/meta/recipes-devtools/strace/strace_4.18.bb
+++ b/meta/recipes-devtools/strace/strace_4.19.bb
@@ -16,8 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ 16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
17 " 17 "
18 18
19SRC_URI[md5sum] = "3579b3266bb096cebaefbe2cdb1a3a78" 19SRC_URI[md5sum] = "846a9a26e74e797f42d77a0348104072"
20SRC_URI[sha256sum] = "89ad887c1e6226bdbca8da31d589cadea4be0744b142eb47b768086c937fca08" 20SRC_URI[sha256sum] = "7c93ebc6c29280f47c24a0eb86873a99ccb2cac6512c60a60ba4ef99ab807281"
21 21
22inherit autotools ptest bluetooth 22inherit autotools ptest bluetooth
23 23