diff options
| author | Chong Lu <Chong.Lu@windriver.com> | 2014-09-30 17:33:05 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-09 10:21:23 +0000 |
| commit | 24ad27878c404493d01bc8cdffaad5634f854330 (patch) | |
| tree | fb6954c734dc5d0884ce1165564cbb4a03fab32e /meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch | |
| parent | bfe16dbb3c237992a4d5bfc0bbd249257c3b9aff (diff) | |
| download | poky-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/strace/strace-4.8/Makefile-ptest.patch')
| -rw-r--r-- | meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch deleted file mode 100644 index 3a0eb39375..0000000000 --- a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | strace: Add ptest | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate | ||
| 4 | |||
| 5 | Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> | ||
| 6 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
| 7 | |||
| 8 | --- old/tests/Makefile.am 2013-07-23 13:44:24.660481381 +0200 | ||
| 9 | +++ new/tests/Makefile.am 2013-07-23 16:22:42.937654391 +0200 | ||
| 10 | @@ -9,3 +9,21 @@ | ||
| 11 | EXTRA_DIST = init.sh $(TESTS) | ||
| 12 | |||
| 13 | CLEANFILES = check.log | ||
| 14 | + | ||
| 15 | +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) | ||
| 16 | + | ||
| 17 | +install-ptest: | ||
| 18 | + install $(BUILDDIR)/strace $(DESTDIR) | ||
| 19 | + install "$(srcdir)/.."/strace-log-merge $(DESTDIR) | ||
| 20 | + install -d $(DESTDIR)/$(TESTDIR) | ||
| 21 | + cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) | ||
| 22 | + sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile | ||
| 23 | + sed -i -e 's/bash/sh/' $(DESTDIR)/$(TESTDIR)/Makefile | ||
| 24 | + for file in $(check_PROGRAMS); do \ | ||
| 25 | + install $(BUILDDIR)/$(TESTDIR)/$$file $(DESTDIR)/$(TESTDIR); \ | ||
| 26 | + done | ||
| 27 | + for file in $(EXTRA_DIST); do \ | ||
| 28 | + install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ | ||
| 29 | + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ | ||
| 30 | + done | ||
| 31 | + sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net | ||
| 32 | --- a/configure.ac | ||
| 33 | +++ b/configure.ac | ||
| 34 | @@ -6,7 +6,7 @@ AC_INIT([strace], | ||
| 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 | ||
