From 826e36643a3fcb8b4ee4ed79612c63c3a9cc1536 Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Tue, 30 Sep 2014 17:33:05 +0800 Subject: 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. Signed-off-by: Chong Lu Signed-off-by: Ross Burton --- ...-conflict-between-sys-ptrace.h-and-linux-.patch | 108 ---------- .../strace/strace-4.8/Makefile-ptest.patch | 41 ---- .../strace/strace-4.8/git-version-gen | 225 --------------------- meta/recipes-devtools/strace/strace-4.8/run-ptest | 2 - .../strace-4.8/strace-add-configure-options.patch | 60 ------ .../strace-fix-64-bit-process-detection.patch | 34 ---- .../strace/strace-4.9/Makefile-ptest.patch | 53 +++++ .../strace/strace-4.9/git-version-gen | 225 +++++++++++++++++++++ meta/recipes-devtools/strace/strace-4.9/run-ptest | 2 + .../strace-4.9/strace-add-configure-options.patch | 65 ++++++ meta/recipes-devtools/strace/strace_4.8.bb | 48 ----- meta/recipes-devtools/strace/strace_4.9.bb | 46 +++++ 12 files changed, 391 insertions(+), 518 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch delete mode 100644 meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch delete mode 100755 meta/recipes-devtools/strace/strace-4.8/git-version-gen delete mode 100755 meta/recipes-devtools/strace/strace-4.8/run-ptest delete mode 100644 meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch delete mode 100644 meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch create mode 100644 meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch create mode 100755 meta/recipes-devtools/strace/strace-4.9/git-version-gen create mode 100755 meta/recipes-devtools/strace/strace-4.9/run-ptest create mode 100644 meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch delete mode 100644 meta/recipes-devtools/strace/strace_4.8.bb create mode 100644 meta/recipes-devtools/strace/strace_4.9.bb 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 @@ -Upstream-Status: Backport - -From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001 -From: Ali Polatel -Date: Tue, 24 Sep 2013 20:04:32 +0300 -Subject: [PATCH] Work around conflict between and - - -Since glibc-2.18~39 defines ptrace_peeksiginfo_args -which collides with . - -* configure.ac: Check for `struct ptrace_peeksiginfo_args' in -. -* process.c: Work around potential conflict between -and by redefining ptrace_peeksiginfo_args. -* signal.c: Likewise. -* syscall.c: Likewise. -* util.c: Likewise. - -Signed-off-by: Ali Polatel ---- - configure.ac | 2 +- - process.c | 4 ++++ - signal.c | 4 ++++ - syscall.c | 4 ++++ - util.c | 4 ++++ - 5 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f19e4f2..aa4923a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr, - - AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include ]) - --AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,, -+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,, - [#include ]) - - AC_CHECK_TYPES([struct user_desc],,, [#include ]) -diff --git a/process.c b/process.c -index 1a2181b..59428a4 100644 ---- a/process.c -+++ b/process.c -@@ -63,7 +63,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/signal.c b/signal.c -index 7fb9abf..3411ddd 100644 ---- a/signal.c -+++ b/signal.c -@@ -51,7 +51,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/syscall.c b/syscall.c -index 83a95bd..3477dcd 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -48,7 +48,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/util.c b/util.c -index 0dab902..30a7f19 100644 ---- a/util.c -+++ b/util.c -@@ -55,7 +55,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif --- -1.8.2.1 - 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 @@ -strace: Add ptest - -Upstream-Status: Inappropriate - -Signed-off-by: Gabriel Barbu -Signed-off-by: Chong Lu - ---- old/tests/Makefile.am 2013-07-23 13:44:24.660481381 +0200 -+++ new/tests/Makefile.am 2013-07-23 16:22:42.937654391 +0200 -@@ -9,3 +9,21 @@ - EXTRA_DIST = init.sh $(TESTS) - - CLEANFILES = check.log -+ -+buildtest-TESTS: $(check_PROGRAMS) $(TESTS) -+ -+install-ptest: -+ install $(BUILDDIR)/strace $(DESTDIR) -+ install "$(srcdir)/.."/strace-log-merge $(DESTDIR) -+ install -d $(DESTDIR)/$(TESTDIR) -+ cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) -+ sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile -+ sed -i -e 's/bash/sh/' $(DESTDIR)/$(TESTDIR)/Makefile -+ for file in $(check_PROGRAMS); do \ -+ install $(BUILDDIR)/$(TESTDIR)/$$file $(DESTDIR)/$(TESTDIR); \ -+ done -+ for file in $(EXTRA_DIST); do \ -+ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ -+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ -+ done -+ sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net ---- a/configure.ac -+++ b/configure.ac -@@ -6,7 +6,7 @@ AC_INIT([strace], - AC_CONFIG_SRCDIR([strace.c]) - AC_CONFIG_AUX_DIR([.]) - AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules]) -+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests]) - AM_MAINTAINER_MODE - AC_CANONICAL_HOST diff --git a/meta/recipes-devtools/strace/strace-4.8/git-version-gen b/meta/recipes-devtools/strace/strace-4.8/git-version-gen deleted file mode 100755 index 8fee74e121..0000000000 --- a/meta/recipes-devtools/strace/strace-4.8/git-version-gen +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# Print a version string. -scriptversion=2012-12-31.23; # UTC - -# Copyright (C) 2007-2013 Free Software Foundation, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. -# It may be run two ways: -# - from a git repository in which the "git describe" command below -# produces useful output (thus requiring at least one signed tag) -# - from a non-git-repo directory containing a .tarball-version file, which -# presumes this script is invoked like "./git-version-gen .tarball-version". - -# In order to use intra-version strings in your project, you will need two -# separate generated version string files: -# -# .tarball-version - present only in a distribution tarball, and not in -# a checked-out repository. Created with contents that were learned at -# the last time autoconf was run, and used by git-version-gen. Must not -# be present in either $(srcdir) or $(builddir) for git-version-gen to -# give accurate answers during normal development with a checked out tree, -# but must be present in a tarball when there is no version control system. -# Therefore, it cannot be used in any dependencies. GNUmakefile has -# hooks to force a reconfigure at distribution time to get the value -# correct, without penalizing normal development with extra reconfigures. -# -# .version - present in a checked-out repository and in a distribution -# tarball. Usable in dependencies, particularly for files that don't -# want to depend on config.h but do want to track version changes. -# Delete this file prior to any autoconf run where you want to rebuild -# files to pick up a version string change; and leave it stale to -# minimize rebuild time after unrelated changes to configure sources. -# -# As with any generated file in a VC'd directory, you should add -# /.version to .gitignore, so that you don't accidentally commit it. -# .tarball-version is never generated in a VC'd directory, so needn't -# be listed there. -# -# Use the following line in your configure.ac, so that $(VERSION) will -# automatically be up-to-date each time configure is run (and note that -# since configure.ac no longer includes a version string, Makefile rules -# should not depend on configure.ac for version updates). -# -# AC_INIT([GNU project], -# m4_esyscmd([build-aux/git-version-gen .tarball-version]), -# [bug-project@example]) -# -# Then use the following lines in your Makefile.am, so that .version -# will be present for dependencies, and so that .version and -# .tarball-version will exist in distribution tarballs. -# -# EXTRA_DIST = $(top_srcdir)/.version -# BUILT_SOURCES = $(top_srcdir)/.version -# $(top_srcdir)/.version: -# echo $(VERSION) > $@-t && mv $@-t $@ -# dist-hook: -# echo $(VERSION) > $(distdir)/.tarball-version - - -me=$0 - -version="git-version-gen $scriptversion - -Copyright 2011 Free Software Foundation, Inc. -There is NO warranty. You may redistribute this software -under the terms of the GNU General Public License. -For more information about these matters, see the files named COPYING." - -usage="\ -Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] -Print a version string. - -Options: - - --prefix prefix of git tags (default 'v') - --fallback fallback version to use if \"git --version\" fails - - --help display this help and exit - --version output version information and exit - -Running without arguments will suffice in most cases." - -prefix=v -fallback= - -while test $# -gt 0; do - case $1 in - --help) echo "$usage"; exit 0;; - --version) echo "$version"; exit 0;; - --prefix) shift; prefix="$1";; - --fallback) shift; fallback="$1";; - -*) - echo "$0: Unknown option '$1'." >&2 - echo "$0: Try '--help' for more information." >&2 - exit 1;; - *) - if test "x$tarball_version_file" = x; then - tarball_version_file="$1" - elif test "x$tag_sed_script" = x; then - tag_sed_script="$1" - else - echo "$0: extra non-option argument '$1'." >&2 - exit 1 - fi;; - esac - shift -done - -if test "x$tarball_version_file" = x; then - echo "$usage" - exit 1 -fi - -tag_sed_script="${tag_sed_script:-s/x/x/}" - -nl=' -' - -# Avoid meddling by environment variable of the same name. -v= -v_from_git= - -# First see if there is a tarball-only version file. -# then try "git describe", then default. -if test -f $tarball_version_file -then - v=`cat $tarball_version_file` || v= - case $v in - *$nl*) v= ;; # reject multi-line output - [0-9]*) ;; - *) v= ;; - esac - test "x$v" = x \ - && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 -fi - -if test "x$v" != x -then - : # use $v -# Otherwise, if there is at least one git commit involving the working -# directory, and "git describe" output looks sensible, use that to -# derive a version string. -elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ - && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ - && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ - && case $v in - $prefix[0-9]*) ;; - *) (exit 1) ;; - esac -then - # Is this a new git that lists number of commits since the last - # tag or the previous older version that did not? - # Newer: v6.10-77-g0f8faeb - # Older: v6.10-g0f8faeb - case $v in - *-*-*) : git describe is okay three part flavor ;; - *-*) - : git describe is older two part flavor - # Recreate the number of commits and rewrite such that the - # result is the same as if we were using the newer version - # of git describe. - vtag=`echo "$v" | sed 's/-.*//'` - commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \ - || { commit_list=failed; - echo "$0: WARNING: git rev-list failed" 1>&2; } - numcommits=`echo "$commit_list" | wc -l` - v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; - test "$commit_list" = failed && v=UNKNOWN - ;; - esac - - # Change the first '-' to a '.', so version-comparing tools work properly. - # Remove the "g" in git describe's output string, to save a byte. - v=`echo "$v" | sed 's/-/.0./;s/\(.*\)-g/\1-/'`; - v_from_git=1 -elif test "x$fallback" = x || git --version >/dev/null 2>&1; then - v=UNKNOWN -else - v=$fallback -fi - -v=`echo "$v" |sed "s/^$prefix//"` - -# Test whether to append the "-dirty" suffix only if the version -# string we're using came from git. I.e., skip the test if it's "UNKNOWN" -# or if it came from .tarball-version. -if test "x$v_from_git" != x; then - # Don't declare a version "dirty" merely because a time stamp has changed. - git update-index --refresh > /dev/null 2>&1 - - dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= - case "$dirty" in - '') ;; - *) # Append the suffix only if there isn't one already. - case $v in - *-dirty) ;; - *) v="$v-dirty" ;; - esac ;; - esac -fi - -# Omit the trailing newline, so that m4_esyscmd can use the result directly. -echo "$v" | tr -d "$nl" - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/meta/recipes-devtools/strace/strace-4.8/run-ptest b/meta/recipes-devtools/strace/strace-4.8/run-ptest deleted file mode 100755 index 133cf92d02..0000000000 --- a/meta/recipes-devtools/strace/strace-4.8/run-ptest +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -make -C tests -k runtest-TESTS diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch deleted file mode 100644 index 27266d9052..0000000000 --- a/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch +++ /dev/null @@ -1,60 +0,0 @@ -Add options "aio" and "acl" to enable/disable libaio and acl support. - -Upstream-Status: Pending - -Signed-off-by: Kai Kang - ---- strace-4.8/configure.ac.orig 2013-06-21 15:37:52.145892182 +0800 -+++ strace-4.8/configure.ac 2013-06-21 15:45:49.029909004 +0800 -@@ -219,7 +219,6 @@ AC_CHECK_HEADERS(m4_normalize([ - netinet/sctp.h - poll.h - stropts.h -- sys/acl.h - sys/asynch.h - sys/conf.h - sys/epoll.h -@@ -231,6 +230,19 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/uio.h - sys/vfs.h - ])) -+ -+AC_ARG_ENABLE([acl], -+ [AS_HELP_STRING([--enable-acl], [turn on acl support])], -+ [case $enableval in -+ yes) -+ AC_CHECK_HEADERS([sys/acl.h]) -+ ;; -+ no) ;; -+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; -+ esac] -+ -+) -+ - AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], - [], [], [#include - #include -@@ -301,10 +313,19 @@ AC_CHECK_SIZEOF([long]) - AC_CHECK_SIZEOF([long long]) - AC_CHECK_SIZEOF([rlim_t],,[#include ]) - --AC_CHECK_HEADERS([libaio.h], [ -- AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include ]) -- AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include ]) --]) -+AC_ARG_ENABLE([aio], -+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])], -+ [case $enableval in -+ yes) -+ AC_CHECK_HEADERS([libaio.h], [ -+ AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include ]) -+ AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include ]) -+ ]) -+ ;; -+ no) ;; -+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; -+ esac] -+) - - AC_PATH_PROG([PERL], [perl]) - 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 @@ -powerpc64: fix 64-bit process detection on embedded - -* syscall.c (get_scno) [POWERPC64]: Fix 64-bit process detection -on embedded powerpc. - -Upstream-Status: Backport - -Signed-off-by: James Yang -Signed-off-by: Dmitry V. Levin - -diff --git a/syscall.c.orig b/syscall.c -index 7efee0e..72d9453 100644 ---- a/syscall.c.orig -+++ b/syscall.c -@@ -1207,11 +1207,14 @@ get_scno(struct tcb *tcp) - /* Check for 64/32 bit mode. */ - if (upeek(tcp, sizeof(unsigned long)*PT_MSR, &val) < 0) - return -1; -- /* SF is bit 0 of MSR */ -- if (val < 0) -- currpers = 0; -- else -- currpers = 1; -+ -+ /* -+ * Check for 64/32 bit mode. -+ * Embedded implementations covered by Book E extension of PPC use -+ * bit 0 (CM) of 32-bit Machine state register (MSR). -+ * Other implementations use bit 0 (SF) of 64-bit MSR. -+ */ -+ currpers = (val & 0x8000000080000000) ? 0 : 1; - update_personality(tcp, currpers); - # endif - #elif defined(AVR32) diff --git a/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch new file mode 100644 index 0000000000..df013102d7 --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch @@ -0,0 +1,53 @@ +strace: Add ptest + +Upstream-Status: Inappropriate + +Signed-off-by: Gabriel Barbu +Signed-off-by: Chong Lu +--- + configure.ac | 2 +- + tests/Makefile.am | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 054f85b..9aec566 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,7 +6,7 @@ AC_INIT([strace], + AC_CONFIG_SRCDIR([strace.c]) + AC_CONFIG_AUX_DIR([.]) + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests]) ++AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests]) + AM_MAINTAINER_MODE + AC_CANONICAL_HOST + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 922452a..b17837f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -37,3 +37,21 @@ TEST_LOG_COMPILER = $(srcdir)/run.sh + EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS) + + CLEANFILES = $(TESTS:=.tmp) ++ ++buildtest-TESTS: $(check_PROGRAMS) $(TESTS) ++ ++install-ptest: ++ install $(BUILDDIR)/strace $(DESTDIR) ++ install "$(srcdir)/.."/strace-log-merge $(DESTDIR) ++ install -d $(DESTDIR)/$(TESTDIR) ++ cp $(BUILDDIR)/$(TESTDIR)/Makefile $(DESTDIR)/$(TESTDIR) ++ sed -i -e 's/^Makefile:/_Makefile:/' $(DESTDIR)/$(TESTDIR)/Makefile ++ sed -i -e 's/bash/sh/' $(DESTDIR)/$(TESTDIR)/Makefile ++ for file in $(check_PROGRAMS); do \ ++ install $(BUILDDIR)/$(TESTDIR)/$$file $(DESTDIR)/$(TESTDIR); \ ++ done ++ for file in $(EXTRA_DIST); do \ ++ install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ ++ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ ++ done ++ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done +-- +1.9.1 + diff --git a/meta/recipes-devtools/strace/strace-4.9/git-version-gen b/meta/recipes-devtools/strace/strace-4.9/git-version-gen new file mode 100755 index 0000000000..8fee74e121 --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.9/git-version-gen @@ -0,0 +1,225 @@ +#!/bin/sh +# Print a version string. +scriptversion=2012-12-31.23; # UTC + +# Copyright (C) 2007-2013 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# As with any generated file in a VC'd directory, you should add +# /.version to .gitignore, so that you don't accidentally commit it. +# .tarball-version is never generated in a VC'd directory, so needn't +# be listed there. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project@example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .version and +# .tarball-version will exist in distribution tarballs. +# +# EXTRA_DIST = $(top_srcdir)/.version +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + + +me=$0 + +version="git-version-gen $scriptversion + +Copyright 2011 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING." + +usage="\ +Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] +Print a version string. + +Options: + + --prefix prefix of git tags (default 'v') + --fallback fallback version to use if \"git --version\" fails + + --help display this help and exit + --version output version information and exit + +Running without arguments will suffice in most cases." + +prefix=v +fallback= + +while test $# -gt 0; do + case $1 in + --help) echo "$usage"; exit 0;; + --version) echo "$version"; exit 0;; + --prefix) shift; prefix="$1";; + --fallback) shift; fallback="$1";; + -*) + echo "$0: Unknown option '$1'." >&2 + echo "$0: Try '--help' for more information." >&2 + exit 1;; + *) + if test "x$tarball_version_file" = x; then + tarball_version_file="$1" + elif test "x$tag_sed_script" = x; then + tag_sed_script="$1" + else + echo "$0: extra non-option argument '$1'." >&2 + exit 1 + fi;; + esac + shift +done + +if test "x$tarball_version_file" = x; then + echo "$usage" + exit 1 +fi + +tag_sed_script="${tag_sed_script:-s/x/x/}" + +nl=' +' + +# Avoid meddling by environment variable of the same name. +v= +v_from_git= + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || v= + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test "x$v" = x \ + && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 +fi + +if test "x$v" != x +then + : # use $v +# Otherwise, if there is at least one git commit involving the working +# directory, and "git describe" output looks sensible, use that to +# derive a version string. +elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ + && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ + && case $v in + $prefix[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \ + || { commit_list=failed; + echo "$0: WARNING: git rev-list failed" 1>&2; } + numcommits=`echo "$commit_list" | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + test "$commit_list" = failed && v=UNKNOWN + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/.0./;s/\(.*\)-g/\1-/'`; + v_from_git=1 +elif test "x$fallback" = x || git --version >/dev/null 2>&1; then + v=UNKNOWN +else + v=$fallback +fi + +v=`echo "$v" |sed "s/^$prefix//"` + +# Test whether to append the "-dirty" suffix only if the version +# string we're using came from git. I.e., skip the test if it's "UNKNOWN" +# or if it came from .tarball-version. +if test "x$v_from_git" != x; then + # Don't declare a version "dirty" merely because a time stamp has changed. + git update-index --refresh > /dev/null 2>&1 + + dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= + case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; + esac +fi + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d "$nl" + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/meta/recipes-devtools/strace/strace-4.9/run-ptest b/meta/recipes-devtools/strace/strace-4.9/run-ptest new file mode 100755 index 0000000000..133cf92d02 --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.9/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +make -C tests -k runtest-TESTS diff --git a/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch new file mode 100644 index 0000000000..15e37bce03 --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch @@ -0,0 +1,65 @@ +Add options "aio" and "acl" to enable/disable libaio and acl support. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang +Signed-off-by: Chong Lu +--- + configure.ac | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 054f85b..8ed49f1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([ + poll.h + scsi/sg.h + stropts.h +- sys/acl.h + sys/asynch.h + sys/conf.h + sys/epoll.h +@@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([ + sys/uio.h + sys/vfs.h + ])) ++ ++AC_ARG_ENABLE([acl], ++ [AS_HELP_STRING([--enable-acl], [turn on acl support])], ++ [case $enableval in ++ yes) ++ AC_CHECK_HEADERS([sys/acl.h]) ++ ;; ++ no) ;; ++ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; ++ esac] ++) ++ + AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], + [], [], [#include + #include +@@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then + [Define to 1 if the system provides __builtin_popcount function]) + fi + ++AC_ARG_ENABLE([aio], ++ [AS_HELP_STRING([--enable-aio], [turn on libaio support])], ++ [case $enableval in ++ yes) ++ AC_CHECK_HEADERS([libaio.h], [ ++ AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include ]) ++ AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include ]) ++ ]) ++ ;; ++ no) ;; ++ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; ++ esac] ++) ++ + AC_PATH_PROG([PERL], [perl]) + + dnl stack trace with libunwind +-- +1.9.1 + diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb deleted file mode 100644 index ed738eaad7..0000000000 --- a/meta/recipes-devtools/strace/strace_4.8.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "System call tracing tool" -HOMEPAGE = "http://strace.sourceforge.net" -SECTION = "console/utils" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" - -SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ - file://git-version-gen \ - file://strace-add-configure-options.patch \ - file://Makefile-ptest.patch \ - file://strace-fix-64-bit-process-detection.patch \ - file://run-ptest \ - file://0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch \ - " - -SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" -SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8" - -inherit autotools ptest -RDEPENDS_${PN}-ptest += "make" - -PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" - -PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" - -export INCLUDES = "-I. -I./linux" - -TESTDIR = "tests" - -do_configure_prepend() { - cp ${WORKDIR}/git-version-gen ${S} -} - -do_install_append() { - # We don't ship strace-graph here because it needs perl - rm ${D}${bindir}/strace-graph -} - -do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/strace/strace_4.9.bb b/meta/recipes-devtools/strace/strace_4.9.bb new file mode 100644 index 0000000000..f64c6ecac4 --- /dev/null +++ b/meta/recipes-devtools/strace/strace_4.9.bb @@ -0,0 +1,46 @@ +SUMMARY = "System call tracing tool" +HOMEPAGE = "http://strace.sourceforge.net" +SECTION = "console/utils" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" + +SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ + file://git-version-gen \ + file://strace-add-configure-options.patch \ + file://Makefile-ptest.patch \ + file://run-ptest \ + " + +SRC_URI[md5sum] = "885eafadb10f6c60464a266d3929a2a4" +SRC_URI[sha256sum] = "095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65" + +inherit autotools ptest +RDEPENDS_${PN}-ptest += "make coreutils grep gawk" + +PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" + +PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" + +export INCLUDES = "-I. -I./linux" + +TESTDIR = "tests" + +do_configure_prepend() { + cp ${WORKDIR}/git-version-gen ${S} +} + +do_install_append() { + # We don't ship strace-graph here because it needs perl + rm ${D}${bindir}/strace-graph +} + +do_compile_ptest() { + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} +} + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg