diff options
Diffstat (limited to 'poky/meta/recipes-devtools/strace')
13 files changed, 82 insertions, 125 deletions
diff --git a/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch index 52d2cdcdc5..235e803641 100644 --- a/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ b/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch @@ -1,4 +1,4 @@ -From d225aaa8841f47ba8aa7b353b0ac3028d5913efe 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 diff --git a/poky/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/poky/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch new file mode 100644 index 0000000000..c4c176e6bc --- /dev/null +++ b/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/poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch b/poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch deleted file mode 100644 index 95d85bf34a..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 879ae71c472ce522f1b3514d2abf6ad49b4acc07 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 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - tests/sigaction.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/tests/sigaction.c -+++ b/tests/sigaction.c -@@ -156,7 +156,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" diff --git a/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 08fa5c53b8..42c1893f39 100644 --- a/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From ef5040b4f15006a22ac63a3bacfceac36ffc2045 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 825c989..4623c48 100644 +index 8cf4c36..66162eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -14,6 +14,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 825c989..4623c48 100644 AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = $(ARCH_MFLAGS) \ -I$(builddir) \ -@@ -477,3 +478,21 @@ BUILT_SOURCES = ksysent.h +@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h CLEANFILES = ksysent.h include ../scno.am @@ -44,6 +44,6 @@ index 825c989..4623c48 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/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch index 5fefff33e9..e8dbd7f273 100644 --- a/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch +++ b/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch @@ -1,4 +1,4 @@ -From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc 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,7 +16,7 @@ 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 949b058..4ba989c 100644 +index dd4f13f..65f000b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,12 @@ diff --git a/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch index 0d3192b345..e86da9707c 100644 --- a/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ b/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch @@ -1,4 +1,4 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 +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 diff --git a/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted file mode 100644 index a9bd900da8..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cc97307e8e39a81999c6a365d057487a02e6128e 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(+) - -diff --git a/m4/mpers.m4 b/m4/mpers.m4 -index 13725d7..d8578ea 100644 ---- a/m4/mpers.m4 -+++ b/m4/mpers.m4 -@@ -88,6 +88,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])]) -@@ -95,6 +96,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/poky/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/poky/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 3e32cc388c..c5d8ff9207 100644 --- a/poky/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/poky/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,3 +1,8 @@ +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. @@ -5,10 +10,14 @@ RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] -Index: strace-4.26/tests/gen_tests.sh -=================================================================== ---- strace-4.26.orig/tests/gen_tests.sh -+++ strace-4.26/tests/gen_tests.sh +--- + 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" diff --git a/poky/meta/recipes-devtools/strace/strace/run-ptest b/poky/meta/recipes-devtools/strace/strace/run-ptest index 2fed984e90..4660207220 100755 --- a/poky/meta/recipes-devtools/strace/strace/run-ptest +++ b/poky/meta/recipes-devtools/strace/strace/run-ptest @@ -1,3 +1,6 @@ #!/bin/sh -export TIMEOUT_DURATION=30 -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/poky/meta/recipes-devtools/strace/strace/sys_headers.patch b/poky/meta/recipes-devtools/strace/strace/sys_headers.patch deleted file mode 100644 index e46f2c350d..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/sys_headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove configure checks for few sys/ headers - -sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers -for kernel headers in libc if available, here strace is trying to match -traced process's APIs to syscalls kernel structures - -Removing the checks makes it default to right kernel UAPI headers under linux/ - -Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html] -Suggested-by: Rich Felker <dalias@aerifal.cx> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/configure.ac -+++ b/configure.ac -@@ -439,11 +439,7 @@ AC_CHECK_HEADERS(m4_normalize([ - sys/conf.h - sys/eventfd.h - sys/fanotify.h -- sys/ipc.h -- sys/msg.h - sys/quota.h -- sys/sem.h -- sys/shm.h - sys/signalfd.h - sys/xattr.h - ustat.h diff --git a/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch b/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch index 6d3dd6fb98..088d685af0 100644 --- a/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch +++ b/poky/meta/recipes-devtools/strace/strace/uintptr_t.patch @@ -1,10 +1,20 @@ -include stdint.h for getting uintptr_t definition +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 @@ diff --git a/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 7077048c75..d46b147de5 100644 --- a/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -1,4 +1,4 @@ -From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 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 diff --git a/poky/meta/recipes-devtools/strace/strace_5.3.bb b/poky/meta/recipes-devtools/strace/strace_5.5.bb index b000afb30b..ae552da028 100644 --- a/poky/meta/recipes-devtools/strace/strace_5.3.bb +++ b/poky/meta/recipes-devtools/strace/strace_5.5.bb @@ -2,23 +2,21 @@ SUMMARY = "System call tracing tool" HOMEPAGE = "http://strace.io" SECTION = "console/utils" LICENSE = "LGPL-2.1+ & GPL-2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" +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://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://sys_headers.patch \ + file://0001-strace-fix-reproducibilty-issues.patch \ " -SRC_URI[md5sum] = "84f5e72de813c9b1bb6057ee8ab428d8" -SRC_URI[sha256sum] = "6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047" +SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" +SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" inherit autotools ptest |