diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-08-02 01:51:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:22:23 +0100 |
commit | 46d59011cb29bb2b82217919df76b0bc7af7a0e2 (patch) | |
tree | a6dd719b073402fc3ea4a4547abd29bd785fe71c /meta/recipes-devtools | |
parent | 7dbfe6f73d052e806240a8026fc6cc00b3082350 (diff) | |
download | poky-46d59011cb29bb2b82217919df76b0bc7af7a0e2.tar.gz |
strace: 4.12 -> 4.13
Updated Makefile-ptest.patch
(From OE-Core rev: 56d3ead9da83e1116c5c6e78441275e079e466b2)
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')
-rw-r--r-- | meta/recipes-devtools/strace/strace/Makefile-ptest.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace_4.13.bb (renamed from meta/recipes-devtools/strace/strace_4.12.bb) | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 824031e863..2b76e8a111 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch | |||
@@ -10,23 +10,22 @@ 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 | ||
12 | diff --git a/configure.ac b/configure.ac | 12 | diff --git a/configure.ac b/configure.ac |
13 | index 0209bac..b969e25 100644 | ||
14 | --- a/configure.ac | 13 | --- a/configure.ac |
15 | +++ b/configure.ac | 14 | +++ b/configure.ac |
16 | @@ -36,7 +36,7 @@ AC_INIT([strace], | 15 | @@ -36,7 +36,7 @@ AC_INIT([strace], |
17 | AC_CONFIG_SRCDIR([strace.c]) | 16 | AC_CONFIG_SRCDIR([strace.c]) |
18 | AC_CONFIG_AUX_DIR([.]) | 17 | AC_CONFIG_AUX_DIR([.]) |
19 | AC_CONFIG_HEADERS([config.h]) | 18 | AC_CONFIG_HEADERS([config.h]) |
20 | -AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules parallel-tests]) | 19 | -AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests]) |
21 | +AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules serial-tests]) | 20 | +AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules serial-tests]) |
22 | AM_MAINTAINER_MODE | 21 | AM_MAINTAINER_MODE |
23 | AC_CANONICAL_HOST | 22 | AC_CANONICAL_HOST |
24 | 23 | ||
25 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 24 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
26 | index 0f23b4b..429f7e9 100644 | 25 | index 9023029..e1917fa 100644 |
27 | --- a/tests/Makefile.am | 26 | --- a/tests/Makefile.am |
28 | +++ b/tests/Makefile.am | 27 | +++ b/tests/Makefile.am |
29 | @@ -332,3 +332,21 @@ ksysent.h: $(srcdir)/ksysent.sed | 28 | @@ -784,3 +784,21 @@ ksysent.h: $(srcdir)/ksysent.sed |
30 | 29 | ||
31 | BUILT_SOURCES = ksysent.h | 30 | BUILT_SOURCES = ksysent.h |
32 | CLEANFILES = ksysent.h $(TESTS:=.tmp) | 31 | CLEANFILES = ksysent.h $(TESTS:=.tmp) |
@@ -48,6 +47,3 @@ index 0f23b4b..429f7e9 100644 | |||
48 | + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ | 47 | + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ |
49 | + done | 48 | + done |
50 | + for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done | 49 | + for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done |
51 | -- | ||
52 | 1.9.1 | ||
53 | |||
diff --git a/meta/recipes-devtools/strace/strace_4.12.bb b/meta/recipes-devtools/strace/strace_4.13.bb index 70d74028de..1a576b3a04 100644 --- a/meta/recipes-devtools/strace/strace_4.12.bb +++ b/meta/recipes-devtools/strace/strace_4.13.bb | |||
@@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ | |||
14 | file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ | 14 | file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "efb8611fc332e71ec419c53f59faa93e" | 17 | SRC_URI[md5sum] = "4b78c7febdd24c79d5147824d1a080a3" |
18 | SRC_URI[sha256sum] = "51144b78cb9ba22211b95a5aafe0af3694c0d575b25975d80ca9dd4dfd7c1e59" | 18 | SRC_URI[sha256sum] = "d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7" |
19 | 19 | ||
20 | inherit autotools ptest bluetooth | 20 | inherit autotools ptest bluetooth |
21 | 21 | ||