diff options
Diffstat (limited to 'external/poky/meta/recipes-devtools/strace')
13 files changed, 155 insertions, 174 deletions
diff --git a/external/poky/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch b/external/poky/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch deleted file mode 100644 index 7f59210c..00000000 --- a/external/poky/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1f0c22b79045cfcdc976643f383c1d09589d3087 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Apr 2016 16:23:56 +0000 -Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc - -glibc includes the kernel header into its own header for macros -musl does not - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ptrace.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/ptrace.h b/ptrace.h -index d8af976..4978a69 100644 ---- a/ptrace.h -+++ b/ptrace.h -@@ -52,7 +52,13 @@ extern long ptrace(int, int, char *, long); - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - #endif - --#include <linux/ptrace.h> -+#if defined(POWERPC) && !defined(__GLIBC__) -+#define pt_regs uapi_pt_regs -+#endif -+# include <linux/ptrace.h> -+#if defined(POWERPC) && !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #ifdef HAVE_STRUCT_IA64_FPREG - # undef ia64_fpreg --- -1.8.3.1 - diff --git a/external/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/external/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 4f137061..235e8036 100644 --- a/external/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/external/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From 83757523c50748ea845c1e220b1c3b2080d3cc49 Mon Sep 17 00:00:00 2001 +From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Thu, 9 Feb 2017 01:27:49 -0800 Subject: [PATCH] caps-abbrev.awk: fix gawk's path @@ -8,6 +8,7 @@ It should be /usr/bin/gawk as other scripts use in this package. Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + --- tests-m32/caps-abbrev.awk | 2 +- tests-mx32/caps-abbrev.awk | 2 +- @@ -15,7 +16,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk -index 86de7f2..0535cac 100644 +index c00023b..a56cd56 100644 --- a/tests-m32/caps-abbrev.awk +++ b/tests-m32/caps-abbrev.awk @@ -1,4 +1,4 @@ @@ -25,7 +26,7 @@ index 86de7f2..0535cac 100644 # This file is part of caps strace test. # diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk -index 86de7f2..0535cac 100644 +index c00023b..a56cd56 100644 --- a/tests-mx32/caps-abbrev.awk +++ b/tests-mx32/caps-abbrev.awk @@ -1,4 +1,4 @@ @@ -35,7 +36,7 @@ index 86de7f2..0535cac 100644 # This file is part of caps strace test. # diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk -index 86de7f2..0535cac 100644 +index c00023b..a56cd56 100644 --- a/tests/caps-abbrev.awk +++ b/tests/caps-abbrev.awk @@ -1,4 +1,4 @@ @@ -44,6 +45,3 @@ index 86de7f2..0535cac 100644 # # This file is part of caps strace test. # --- -2.10.2 - diff --git a/external/poky/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/external/poky/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch new file mode 100644 index 00000000..c4c176e6 --- /dev/null +++ b/external/poky/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch @@ -0,0 +1,39 @@ +From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman <jpuhlman@mvista.com> +Date: Wed, 11 Mar 2020 19:56:55 +0000 +Subject: [PATCH] strace: fix reproducibilty issues + +The full path to the gen_tests.sh script is encoded in the tests + +Upstream-Status: Pending + +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + tests/gen_tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 5e1e7c9..1e65eac 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh +@@ -46,7 +46,7 @@ while read -r name arg0 args; do { + + hdr="\ + #!/bin/sh -efu +-# Generated by $0 from $input ($name $arg0 $args); do not edit." ++# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit." + + case "$arg0" in + +*) +@@ -80,7 +80,7 @@ while read -r name arg0 args; do { + + if [ -n "$names" ]; then + { +- printf '# Generated by %s from %s; do not edit.\n' "$0" "$input" ++ printf '# Generated by %s from %s; do not edit.\n' "$(basename $0)" "$input" + printf 'GEN_TESTS =' + printf ' %s.gen.test' $names + echo +-- +2.24.1 + diff --git a/external/poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch b/external/poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch deleted file mode 100644 index 52096b28..00000000 --- a/external/poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9f3fd388ae7c46420bccba405468690ed46d669a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 18 Sep 2017 22:51:32 -0700 -Subject: [PATCH] tests/sigaction: Check for mips and alpha before using - sa_restorer - -local structure does not define restorer member for mips and alpha -in definition, we need to match that assumption here where they are -being set - -Fixes -| ../../strace-4.18/tests/sigaction.c:177:36: error: 'struct_set_sa {aka struct set_sa}' has no member named 'restorer' -| # define SA_RESTORER_ARGS , new_act->restorer - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - tests/sigaction.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/sigaction.c b/tests/sigaction.c -index 7b46944..f46cda7 100644 ---- a/tests/sigaction.c -+++ b/tests/sigaction.c -@@ -170,7 +170,7 @@ main(void) - sigdelset(mask.libc, SIGHUP); - - memcpy(new_act->mask, mask.old, sizeof(mask.old)); --#ifdef SA_RESTORER -+#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA) - new_act->flags = SA_RESTORER; - new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL; - # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx" --- -2.14.1 - diff --git a/external/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/external/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 460b6e26..42c1893f 100644 --- a/external/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/external/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From 207fc7814bbeb0241382329215d21fd3b57066f9 Mon Sep 17 00:00:00 2001 +From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <gabriel.barbu@enea.com> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -14,10 +14,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 1 file changed, 19 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index a2f3950..4fa97e2 100644 +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -34,6 +34,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ +@@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ MPERS_NAME = MPERS_CC_FLAGS = ARCH_MFLAGS = @@ -25,7 +25,7 @@ index a2f3950..4fa97e2 100644 AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -490,3 +491,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am @@ -44,6 +44,6 @@ index a2f3950..4fa97e2 100644 + done + for file in $(EXTRA_DIST); do \ + install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ -+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ ++ #sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done + for i in net scm_rights-fd rt_sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done diff --git a/external/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/external/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 9e5ec110..e8dbd7f2 100644 --- a/external/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/external/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From bee0680754730498485e24dd037303318c68916c Mon Sep 17 00:00:00 2001 +From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Mon, 18 Jan 2016 13:33:50 -0800 Subject: [PATCH] strace: remove need for scripts @@ -16,20 +16,20 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index ad1d00f..96fa205 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac -@@ -32,12 +32,12 @@ +@@ -12,12 +12,12 @@ AC_PREREQ(2.57) AC_INIT([strace], -- m4_esyscmd([./git-version-gen .tarball-version]), +- st_esyscmd_s([./git-version-gen .tarball-version]), + m4_esyscmd_s([cat .tarball-version]), [strace-devel@lists.strace.io], [strace], [https://strace.io]) --m4_define([copyright_year], m4_esyscmd([./copyright-year-gen .year])) --m4_define([manpage_date], m4_esyscmd([./file-date-gen strace.1.in])) +-m4_define([copyright_year], st_esyscmd_s([./copyright-year-gen .year])) +-m4_define([manpage_date], st_esyscmd_s([./file-date-gen strace.1.in])) +m4_define([copyright_year], m4_esyscmd_s([cat .year])) +m4_define([manpage_date], m4_esyscmd_s([cat .strace.1.in.date])) AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.]) diff --git a/external/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/external/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index b24378bf..e86da970 100644 --- a/external/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/external/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,3 +1,8 @@ +From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 7 Aug 2016 23:47:57 -0700 +Subject: [PATCH] strace: Fix build with mips/mips64 on musl + SIGEMT is not defined everywhere e.g musl does not define it. Therefore check it being defined before using it. @@ -8,11 +13,15 @@ Fixes errors e.g. Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: strace-4.13/tests/signal2name.c -=================================================================== ---- strace-4.13.orig/tests/signal2name.c -+++ strace-4.13/tests/signal2name.c -@@ -42,7 +42,9 @@ signal2name(int sig) +--- + tests/signal2name.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/signal2name.c b/tests/signal2name.c +index 1d8e7c5..6722aa1 100644 +--- a/tests/signal2name.c ++++ b/tests/signal2name.c +@@ -49,7 +49,9 @@ signal2name(int sig) CASE(SIGEMT); CASE(SIGLOST); #elif defined MIPS diff --git a/external/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/external/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index 3d4913d6..00000000 --- a/external/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 154af50ed7ed8b91838d713052ebf29b0b14f765 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Mon, 18 Jan 2016 11:00:00 -0800 -Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support - -When using the default OE toolchain for x86-64, the basic checks for --m32 and -mx32 compile support in mpers.m4 pass but later attempts to -actually use the toolchain with -m32 fail, e.g. - - | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0, - | from ../strace-4.11/defs.h:55, - | from mpers-m32/kernel_dirent.c:32: - | /home/andre/build/tmp/sysroots/qemux86-64/usr/include/bits/syscall.h:41:29: fatal error: bits/syscall-32.h: No such file or directory - -Make the mpers.m4 tests more robust so that configure correctly -detects the limitations of the OE toolchain. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - m4/mpers.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -Index: strace-4.22/m4/mpers.m4 -=================================================================== ---- strace-4.22.orig/m4/mpers.m4 -+++ strace-4.22/m4/mpers.m4 -@@ -108,6 +108,7 @@ case "$arch" in - CFLAGS="$CFLAGS MPERS_CFLAGS $IFLAG" - AC_CACHE_CHECK([for mpers_name personality compile support], [st_cv_cc], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> -+ #include <sys/syscall.h> - int main(){return 0;}]])], - [st_cv_cc=yes], - [st_cv_cc=no])]) -@@ -115,6 +116,7 @@ case "$arch" in - AC_CACHE_CHECK([for mpers_name personality runtime support], - [st_cv_runtime], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> -+ #include <sys/syscall.h> - int main(){return 0;}]])], - [st_cv_runtime=yes], - [st_cv_runtime=no], diff --git a/external/poky/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/external/poky/meta/recipes-devtools/strace/strace/ptest-spacesave.patch new file mode 100644 index 00000000..c5d8ff92 --- /dev/null +++ b/external/poky/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -0,0 +1,28 @@ +From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Wed, 29 May 2019 00:10:32 +0100 +Subject: [PATCH] strace: Tweak ptest disk space management + +If the test is successful, remove the log and exp files. This stops strace +using around 600MB of disk space and running our ptest images out of space. + +RP 2019/5/29 + +Upstream-Status: Inappropriate [specific to OE image space issues] + +--- + tests/gen_tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 3540204..5e1e7c9 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh +@@ -62,6 +62,7 @@ while read -r name arg0 args; do { + $hdr + . "\${srcdir=.}/init.sh" + run_strace_match_diff $arg0 $args ++ rm -rf log exp + EOF + ;; + diff --git a/external/poky/meta/recipes-devtools/strace/strace/run-ptest b/external/poky/meta/recipes-devtools/strace/strace/run-ptest index 8070d831..46602072 100755 --- a/external/poky/meta/recipes-devtools/strace/strace/run-ptest +++ b/external/poky/meta/recipes-devtools/strace/strace/run-ptest @@ -1,2 +1,6 @@ #!/bin/sh -make -B -C tests -k test-suite.log +export TIMEOUT_DURATION=120 +chown nobody tests +chown nobody tests/* +chown nobody ../ptest +su nobody -c "make -B -C tests -k test-suite.log" diff --git a/external/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch b/external/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch new file mode 100644 index 00000000..088d685a --- /dev/null +++ b/external/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -0,0 +1,27 @@ +From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 5 Nov 2019 20:05:08 -0800 +Subject: [PATCH] include stdint.h for getting uintptr_t definition + +fixes do_compile_ptest_base +tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + tests/fanotify_mark.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c +index aade643..de579f3 100644 +--- a/tests/fanotify_mark.c ++++ b/tests/fanotify_mark.c +@@ -18,6 +18,7 @@ + + # include <limits.h> + # include <stdio.h> ++# include <stdint.h> + # include <unistd.h> + # include <sys/fanotify.h> + diff --git a/external/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/external/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index f6ffa8e7..d46b147d 100644 --- a/external/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/external/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From 3836518c46bd5bb3e71371b1b18274bf2d487133 Mon Sep 17 00:00:00 2001 +From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk @@ -11,6 +11,7 @@ from #!/bin/gawk to #!/usr/bin/gawk. Fixes missing RDPENDS QA tests: Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + --- mpers.awk | 2 +- tests-m32/caps.awk | 2 +- @@ -25,7 +26,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mpers.awk b/mpers.awk -index fe54763..b5238a8 100644 +index 17f8f2b..d69dcd5 100644 --- a/mpers.awk +++ b/mpers.awk @@ -1,4 +1,4 @@ @@ -35,7 +36,7 @@ index fe54763..b5238a8 100644 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org> diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk -index c6e31ef..5efc6cc 100644 +index 941564a..0bcc3ff 100644 --- a/tests-m32/caps.awk +++ b/tests-m32/caps.awk @@ -1,4 +1,4 @@ @@ -45,17 +46,17 @@ index c6e31ef..5efc6cc 100644 # This file is part of caps strace test. # diff --git a/tests-m32/match.awk b/tests-m32/match.awk -index abfbae9..f2740bf 100644 +index d91c518..ee5d908 100644 --- a/tests-m32/match.awk +++ b/tests-m32/match.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # - # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> + # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org> # All rights reserved. diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk -index 9c3a9ed..8414243 100644 +index 81dd813..9cd9549 100644 --- a/tests-m32/rt_sigaction.awk +++ b/tests-m32/rt_sigaction.awk @@ -1,4 +1,4 @@ @@ -65,7 +66,7 @@ index 9c3a9ed..8414243 100644 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk -index c6e31ef..5efc6cc 100644 +index 941564a..0bcc3ff 100644 --- a/tests-mx32/caps.awk +++ b/tests-mx32/caps.awk @@ -1,4 +1,4 @@ @@ -75,17 +76,17 @@ index c6e31ef..5efc6cc 100644 # This file is part of caps strace test. # diff --git a/tests-mx32/match.awk b/tests-mx32/match.awk -index abfbae9..f2740bf 100644 +index d91c518..ee5d908 100644 --- a/tests-mx32/match.awk +++ b/tests-mx32/match.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # - # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> + # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org> # All rights reserved. diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk -index 9c3a9ed..8414243 100644 +index 81dd813..9cd9549 100644 --- a/tests-mx32/rt_sigaction.awk +++ b/tests-mx32/rt_sigaction.awk @@ -1,4 +1,4 @@ @@ -95,7 +96,7 @@ index 9c3a9ed..8414243 100644 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> diff --git a/tests/caps.awk b/tests/caps.awk -index c6e31ef..5efc6cc 100644 +index 941564a..0bcc3ff 100644 --- a/tests/caps.awk +++ b/tests/caps.awk @@ -1,4 +1,4 @@ @@ -105,17 +106,17 @@ index c6e31ef..5efc6cc 100644 # This file is part of caps strace test. # diff --git a/tests/match.awk b/tests/match.awk -index abfbae9..f2740bf 100644 +index d91c518..ee5d908 100644 --- a/tests/match.awk +++ b/tests/match.awk @@ -1,4 +1,4 @@ -#!/bin/gawk +#!/usr/bin/gawk # - # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> + # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org> # All rights reserved. diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk -index 9c3a9ed..8414243 100644 +index 81dd813..9cd9549 100644 --- a/tests/rt_sigaction.awk +++ b/tests/rt_sigaction.awk @@ -1,4 +1,4 @@ diff --git a/external/poky/meta/recipes-devtools/strace/strace_4.24.bb b/external/poky/meta/recipes-devtools/strace/strace_5.5.bb index 9e40a064..ae552da0 100644 --- a/external/poky/meta/recipes-devtools/strace/strace_4.24.bb +++ b/external/poky/meta/recipes-devtools/strace/strace_5.5.bb @@ -1,30 +1,30 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=6ddb91734b9c705f3e87362e97e5f64b" +LICENSE = "LGPL-2.1+ & GPL-2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c" SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://disable-git-version-gen.patch \ - file://more-robust-test-for-m32-mx32-compile-support.patch \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ - file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ - file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ + file://ptest-spacesave.patch \ + file://uintptr_t.patch \ + file://0001-strace-fix-reproducibilty-issues.patch \ " -SRC_URI[md5sum] = "8780136849c85acf76ad3a522aa4462a" -SRC_URI[sha256sum] = "1f4e59fc1edfa2bfb4adf2a748623dc25b105ec79713dd84404199f91b0b0634" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" -inherit autotools ptest bluetooth +inherit autotools ptest PACKAGECONFIG_class-target ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ " -PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" +PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" EXTRA_OECONF += "--enable-mpers=no" @@ -32,6 +32,7 @@ EXTRA_OECONF += "--enable-mpers=no" CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext" TESTDIR = "tests" +PTEST_BUILD_HOST_PATTERN = "^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD|LDFLAGS_FOR_BUILD)" do_install_append() { # We don't ship strace-graph here because it needs perl @@ -46,16 +47,7 @@ do_install_ptest() { oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} install -m 755 ${S}/test-driver ${D}${PTEST_PATH} install -m 644 ${B}/config.h ${D}${PTEST_PATH} - sed -i -e '/^src/s/strace.*[1-9]/ptest/' \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${RECIPE_SYSROOT}::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -e '/^DEB_CHANGELOGTIME/d' \ - -e '/^RPM_CHANGELOGTIME/d' \ - ${D}/${PTEST_PATH}/${TESTDIR}/Makefile + sed -i -e '/^src/s/strace.*[1-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" |