summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch2
-rw-r--r--meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch52
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch6
-rw-r--r--meta/recipes-devtools/strace/strace/disable-git-version-gen.patch4
-rw-r--r--meta/recipes-devtools/strace/strace/mips-SIGEMT.patch2
-rw-r--r--meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch43
-rw-r--r--meta/recipes-devtools/strace/strace/ptest-spacesave.patch17
-rw-r--r--meta/recipes-devtools/strace/strace/sys_headers.patch25
-rw-r--r--meta/recipes-devtools/strace/strace/uintptr_t.patch12
-rw-r--r--meta/recipes-devtools/strace/strace/update-gawk-paths.patch2
-rw-r--r--meta/recipes-devtools/strace/strace_5.5.bb (renamed from meta/recipes-devtools/strace/strace_5.4.bb)9
11 files changed, 36 insertions, 138 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
index 52d2cdcdc5..235e803641 100644
--- a/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
+++ b/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
@@ -1,4 +1,4 @@
1From d225aaa8841f47ba8aa7b353b0ac3028d5913efe Mon Sep 17 00:00:00 2001 1From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 9 Feb 2017 01:27:49 -0800 3Date: Thu, 9 Feb 2017 01:27:49 -0800
4Subject: [PATCH] caps-abbrev.awk: fix gawk's path 4Subject: [PATCH] caps-abbrev.awk: fix gawk's path
diff --git a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch b/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
deleted file mode 100644
index dd0617a15f..0000000000
--- a/meta/recipes-devtools/strace/strace/0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 86bbe1135d5d13db1ced64141acfb513c03d2f30 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 Dec 2019 10:18:38 -0800
4Subject: [PATCH] define ptrace_syscall_info to __ptrace_syscall_info
5
6glibc 2.31+ has defined __ptrace_syscall_info [1]
7
8[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d1e411e5c786ce3028d98b4e6fc02c2fcf66ae37;hp=2e4e75727eb05eef4c10470d865bd42962d5fae7
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 get_personality.h | 2 ++
14 ptrace.h | 2 ++
15 2 files changed, 4 insertions(+)
16
17--- a/get_personality.h
18+++ b/get_personality.h
19@@ -10,7 +10,9 @@
20
21 # include "ptrace.h"
22
23+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
24 extern int
25 get_personality_from_syscall_info(const struct ptrace_syscall_info *);
26+# endif
27
28 #endif /* !STRACE_GET_PERSONALITY_H */
29--- a/ptrace.h
30+++ b/ptrace.h
31@@ -186,6 +186,9 @@ struct ptrace_syscall_info {
32 };
33 # endif
34
35+# if HAVE_STRUCT___PTRACE_SYSCALL_INFO
36+# define ptrace_syscall_info __ptrace_syscall_info
37+# endif
38 # if !HAVE_DECL_PTRACE_PEEKUSER
39 # define PTRACE_PEEKUSER PTRACE_PEEKUSR
40 # endif
41--- a/configure.ac
42+++ b/configure.ac
43@@ -317,7 +317,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtime_n
44 AC_CHECK_TYPES(m4_normalize([
45 struct pt_all_user_regs,
46 struct ia64_fpreg,
47- struct ptrace_peeksiginfo_args
48+ struct ptrace_peeksiginfo_args,
49+ struct __ptrace_syscall_info
50 ]),,, [#include <sys/ptrace.h>])
51
52 # For kernels that do not have v3.10-rc1~201^2~11
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 1f01ef79f2..42c1893f39 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,4 +1,4 @@
1From ef5040b4f15006a22ac63a3bacfceac36ffc2045 Mon Sep 17 00:00:00 2001 1From ee47e205255928679701a5b769bd7ae0f815119d Mon Sep 17 00:00:00 2001
2From: Gabriel Barbu <gabriel.barbu@enea.com> 2From: Gabriel Barbu <gabriel.barbu@enea.com>
3Date: Thu, 25 Jul 2013 15:28:33 +0200 3Date: Thu, 25 Jul 2013 15:28:33 +0200
4Subject: [PATCH] strace: Add ptest 4Subject: [PATCH] strace: Add ptest
@@ -13,6 +13,8 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13 tests/Makefile.am | 19 +++++++++++++++++++ 13 tests/Makefile.am | 19 +++++++++++++++++++
14 1 file changed, 19 insertions(+) 14 1 file changed, 19 insertions(+)
15 15
16diff --git a/tests/Makefile.am b/tests/Makefile.am
17index 8cf4c36..66162eb 100644
16--- a/tests/Makefile.am 18--- a/tests/Makefile.am
17+++ b/tests/Makefile.am 19+++ b/tests/Makefile.am
18@@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ 20@@ -15,6 +15,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -23,7 +25,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
23 AM_CFLAGS = $(WARN_CFLAGS) 25 AM_CFLAGS = $(WARN_CFLAGS)
24 AM_CPPFLAGS = $(ARCH_MFLAGS) \ 26 AM_CPPFLAGS = $(ARCH_MFLAGS) \
25 -I$(builddir) \ 27 -I$(builddir) \
26@@ -531,3 +532,21 @@ BUILT_SOURCES = ksysent.h 28@@ -538,3 +539,21 @@ BUILT_SOURCES = ksysent.h
27 CLEANFILES = ksysent.h 29 CLEANFILES = ksysent.h
28 30
29 include ../scno.am 31 include ../scno.am
diff --git a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
index 5fefff33e9..e8dbd7f273 100644
--- a/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
+++ b/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
@@ -1,4 +1,4 @@
1From 3bc47502ab011ea8d7c9cd724b25174ecd9506bc Mon Sep 17 00:00:00 2001 1From d87a7feb5ea75da7061afdd473faba044ec8eb0f Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Mon, 18 Jan 2016 13:33:50 -0800 3Date: Mon, 18 Jan 2016 13:33:50 -0800
4Subject: [PATCH] strace: remove need for scripts 4Subject: [PATCH] strace: remove need for scripts
@@ -16,7 +16,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
16 1 file changed, 3 insertions(+), 3 deletions(-) 16 1 file changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/configure.ac b/configure.ac 18diff --git a/configure.ac b/configure.ac
19index 949b058..4ba989c 100644 19index dd4f13f..65f000b 100644
20--- a/configure.ac 20--- a/configure.ac
21+++ b/configure.ac 21+++ b/configure.ac
22@@ -12,12 +12,12 @@ 22@@ -12,12 +12,12 @@
diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
index 0d3192b345..e86da9707c 100644
--- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
+++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
@@ -1,4 +1,4 @@
1From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 1From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 7 Aug 2016 23:47:57 -0700 3Date: Sun, 7 Aug 2016 23:47:57 -0700
4Subject: [PATCH] strace: Fix build with mips/mips64 on musl 4Subject: [PATCH] strace: Fix build with mips/mips64 on musl
diff --git a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
deleted file mode 100644
index ae22105cbe..0000000000
--- a/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From cc97307e8e39a81999c6a365d057487a02e6128e Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Mon, 18 Jan 2016 11:00:00 -0800
4Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support
5
6When using the default OE toolchain for x86-64, the basic checks for
7-m32 and -mx32 compile support in mpers.m4 pass but later attempts to
8actually use the toolchain with -m32 fail, e.g.
9
10 | In file included from /home/andre/build/tmp/sysroots/qemux86-64/usr/include/sys/syscall.h:31:0,
11 | from ../strace-4.11/defs.h:55,
12 | from mpers-m32/kernel_dirent.c:32:
13 | /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
14
15Make the mpers.m4 tests more robust so that configure correctly
16detects the limitations of the OE toolchain.
17
18Upstream-Status: Pending
19
20Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
21
22---
23 m4/mpers.m4 | 2 ++
24 1 file changed, 2 insertions(+)
25
26--- a/m4/mpers.m4
27+++ b/m4/mpers.m4
28@@ -103,6 +103,7 @@ case "$arch" in
29 CFLAGS="$CFLAGS MPERS_CFLAGS${IFLAG:+ }$IFLAG"
30 AC_CACHE_CHECK([for mpers_name personality compile support (using $CC $CFLAGS)], [st_cv_cc],
31 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
32+ #include <sys/syscall.h>
33 int main(){return 0;}]])],
34 [st_cv_cc=yes],
35 [st_cv_cc=no])])
36@@ -110,6 +111,7 @@ case "$arch" in
37 AC_CACHE_CHECK([for mpers_name personality runtime support],
38 [st_cv_runtime],
39 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
40+ #include <sys/syscall.h>
41 int main(){return 0;}]])],
42 [st_cv_runtime=yes],
43 [st_cv_runtime=no],
diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
index 3e32cc388c..c5d8ff9207 100644
--- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
+++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
@@ -1,3 +1,8 @@
1From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 29 May 2019 00:10:32 +0100
4Subject: [PATCH] strace: Tweak ptest disk space management
5
1If the test is successful, remove the log and exp files. This stops strace 6If the test is successful, remove the log and exp files. This stops strace
2using around 600MB of disk space and running our ptest images out of space. 7using around 600MB of disk space and running our ptest images out of space.
3 8
@@ -5,10 +10,14 @@ RP 2019/5/29
5 10
6Upstream-Status: Inappropriate [specific to OE image space issues] 11Upstream-Status: Inappropriate [specific to OE image space issues]
7 12
8Index: strace-4.26/tests/gen_tests.sh 13---
9=================================================================== 14 tests/gen_tests.sh | 1 +
10--- strace-4.26.orig/tests/gen_tests.sh 15 1 file changed, 1 insertion(+)
11+++ strace-4.26/tests/gen_tests.sh 16
17diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh
18index 3540204..5e1e7c9 100755
19--- a/tests/gen_tests.sh
20+++ b/tests/gen_tests.sh
12@@ -62,6 +62,7 @@ while read -r name arg0 args; do { 21@@ -62,6 +62,7 @@ while read -r name arg0 args; do {
13 $hdr 22 $hdr
14 . "\${srcdir=.}/init.sh" 23 . "\${srcdir=.}/init.sh"
diff --git a/meta/recipes-devtools/strace/strace/sys_headers.patch b/meta/recipes-devtools/strace/strace/sys_headers.patch
deleted file mode 100644
index d1b704e0d9..0000000000
--- a/meta/recipes-devtools/strace/strace/sys_headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Remove configure checks for few sys/ headers
2
3sys/ipc.h, sys/sem.h, sys/shm.h, and sys/msg.h are actually wrappers
4for kernel headers in libc if available, here strace is trying to match
5traced process's APIs to syscalls kernel structures
6
7Removing the checks makes it default to right kernel UAPI headers under linux/
8
9Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2019-November/009222.html]
10Suggested-by: Rich Felker <dalias@aerifal.cx>
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- a/configure.ac
13+++ b/configure.ac
14@@ -441,11 +441,7 @@ AC_CHECK_HEADERS(m4_normalize([
15 sys/conf.h
16 sys/eventfd.h
17 sys/fanotify.h
18- sys/ipc.h
19- sys/msg.h
20 sys/quota.h
21- sys/sem.h
22- sys/shm.h
23 sys/signalfd.h
24 sys/xattr.h
25 ustat.h
diff --git a/meta/recipes-devtools/strace/strace/uintptr_t.patch b/meta/recipes-devtools/strace/strace/uintptr_t.patch
index 6d3dd6fb98..088d685af0 100644
--- a/meta/recipes-devtools/strace/strace/uintptr_t.patch
+++ b/meta/recipes-devtools/strace/strace/uintptr_t.patch
@@ -1,10 +1,20 @@
1include stdint.h for getting uintptr_t definition 1From a6c9366bfbcef6f3f4bb068b1f1a5623935b5013 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Nov 2019 20:05:08 -0800
4Subject: [PATCH] include stdint.h for getting uintptr_t definition
2 5
3fixes do_compile_ptest_base 6fixes do_compile_ptest_base
4tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? 7tests/fanotify_mark.c:191:23: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'?
5 8
6Upstream-Status: Pending 9Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 tests/fanotify_mark.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c
17index aade643..de579f3 100644
8--- a/tests/fanotify_mark.c 18--- a/tests/fanotify_mark.c
9+++ b/tests/fanotify_mark.c 19+++ b/tests/fanotify_mark.c
10@@ -18,6 +18,7 @@ 20@@ -18,6 +18,7 @@
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
index 7077048c75..d46b147de5 100644
--- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
+++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
@@ -1,4 +1,4 @@
1From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 Mon Sep 17 00:00:00 2001 1From 12a726b280eca94883edcb4da1eaaf8e93d41739 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Mon, 18 Jan 2016 11:01:00 -0800 3Date: Mon, 18 Jan 2016 11:01:00 -0800
4Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk 4Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk
diff --git a/meta/recipes-devtools/strace/strace_5.4.bb b/meta/recipes-devtools/strace/strace_5.5.bb
index 1e428ccd64..6e7d63949d 100644
--- a/meta/recipes-devtools/strace/strace_5.4.bb
+++ b/meta/recipes-devtools/strace/strace_5.5.bb
@@ -2,11 +2,10 @@ SUMMARY = "System call tracing tool"
2HOMEPAGE = "http://strace.io" 2HOMEPAGE = "http://strace.io"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "LGPL-2.1+ & GPL-2+" 4LICENSE = "LGPL-2.1+ & GPL-2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=0169a04810830e94f4b1cfb823c9f592" 5LIC_FILES_CHKSUM = "file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c"
6 6
7SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ 7SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
8 file://disable-git-version-gen.patch \ 8 file://disable-git-version-gen.patch \
9 file://more-robust-test-for-m32-mx32-compile-support.patch \
10 file://update-gawk-paths.patch \ 9 file://update-gawk-paths.patch \
11 file://Makefile-ptest.patch \ 10 file://Makefile-ptest.patch \
12 file://run-ptest \ 11 file://run-ptest \
@@ -14,11 +13,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
14 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 13 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
15 file://ptest-spacesave.patch \ 14 file://ptest-spacesave.patch \
16 file://uintptr_t.patch \ 15 file://uintptr_t.patch \
17 file://sys_headers.patch \
18 file://0001-define-ptrace_syscall_info-to-__ptrace_syscall_info.patch \
19 " 16 "
20SRC_URI[md5sum] = "b2b58f05eb3c5c0bf9d1e26003b4d698" 17SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
21SRC_URI[sha256sum] = "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" 18SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"
22 19
23inherit autotools ptest 20inherit autotools ptest
24 21
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 12:35:14 +0000