summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy MacLeod <Randy.MacLeod@windriver.com>2019-01-11 22:00:51 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-14 11:35:56 +0000
commit6efdcaa5cd597cf90421ef785c9ccc89fd9f207e (patch)
tree7c38ad6c347d4d81a2a0441eef0b68c1ead66174
parent8a0940eb503d7ff30ed21103c9e90efd533c3b83 (diff)
downloadpoky-6efdcaa5cd597cf90421ef785c9ccc89fd9f207e.tar.gz
strace: update from 4.25 to 4.26
Refresh patches using devtool. Update license since the main code is now covered by LGPL-2.1+ and the tests under GPL-2. Fix a MIPS build error with an upstream patch. (From OE-Core rev: 874c5d4cd4902545b0fb924d0313488521fb91e2) Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch10
-rw-r--r--meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch12
-rw-r--r--meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch98
-rw-r--r--meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch12
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch8
-rw-r--r--meta/recipes-devtools/strace/strace/disable-git-version-gen.patch6
-rw-r--r--meta/recipes-devtools/strace/strace/mips-SIGEMT.patch19
-rw-r--r--meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch15
-rw-r--r--meta/recipes-devtools/strace/strace/update-gawk-paths.patch29
-rw-r--r--meta/recipes-devtools/strace/strace_4.26.bb (renamed from meta/recipes-devtools/strace/strace_4.25.bb)9
10 files changed, 160 insertions, 58 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch b/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
index 7f59210ca9..daafceb37b 100644
--- a/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
+++ b/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
@@ -1,4 +1,4 @@
1From 1f0c22b79045cfcdc976643f383c1d09589d3087 Mon Sep 17 00:00:00 2001 1From af1fdce78bff4343f3c84ea118abdc3c739fc646 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 16:23:56 +0000 3Date: Sat, 30 Apr 2016 16:23:56 +0000
4Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc 4Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc
@@ -8,15 +8,16 @@ musl does not
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
11--- 12---
12 ptrace.h | 8 +++++++- 13 ptrace.h | 8 +++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-) 14 1 file changed, 7 insertions(+), 1 deletion(-)
14 15
15diff --git a/ptrace.h b/ptrace.h 16diff --git a/ptrace.h b/ptrace.h
16index d8af976..4978a69 100644 17index 89d4b95..b3f45bb 100644
17--- a/ptrace.h 18--- a/ptrace.h
18+++ b/ptrace.h 19+++ b/ptrace.h
19@@ -52,7 +52,13 @@ extern long ptrace(int, int, char *, long); 20@@ -30,7 +30,13 @@
20 # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args 21 # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
21 #endif 22 #endif
22 23
@@ -31,6 +32,3 @@ index d8af976..4978a69 100644
31 32
32 #ifdef HAVE_STRUCT_IA64_FPREG 33 #ifdef HAVE_STRUCT_IA64_FPREG
33 # undef ia64_fpreg 34 # undef ia64_fpreg
34--
351.8.3.1
36
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 4f13706161..52d2cdcdc5 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 83757523c50748ea845c1e220b1c3b2080d3cc49 Mon Sep 17 00:00:00 2001 1From d225aaa8841f47ba8aa7b353b0ac3028d5913efe 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
@@ -8,6 +8,7 @@ It should be /usr/bin/gawk as other scripts use in this package.
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11
11--- 12---
12 tests-m32/caps-abbrev.awk | 2 +- 13 tests-m32/caps-abbrev.awk | 2 +-
13 tests-mx32/caps-abbrev.awk | 2 +- 14 tests-mx32/caps-abbrev.awk | 2 +-
@@ -15,7 +16,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15 3 files changed, 3 insertions(+), 3 deletions(-) 16 3 files changed, 3 insertions(+), 3 deletions(-)
16 17
17diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk 18diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk
18index 86de7f2..0535cac 100644 19index c00023b..a56cd56 100644
19--- a/tests-m32/caps-abbrev.awk 20--- a/tests-m32/caps-abbrev.awk
20+++ b/tests-m32/caps-abbrev.awk 21+++ b/tests-m32/caps-abbrev.awk
21@@ -1,4 +1,4 @@ 22@@ -1,4 +1,4 @@
@@ -25,7 +26,7 @@ index 86de7f2..0535cac 100644
25 # This file is part of caps strace test. 26 # This file is part of caps strace test.
26 # 27 #
27diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk 28diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk
28index 86de7f2..0535cac 100644 29index c00023b..a56cd56 100644
29--- a/tests-mx32/caps-abbrev.awk 30--- a/tests-mx32/caps-abbrev.awk
30+++ b/tests-mx32/caps-abbrev.awk 31+++ b/tests-mx32/caps-abbrev.awk
31@@ -1,4 +1,4 @@ 32@@ -1,4 +1,4 @@
@@ -35,7 +36,7 @@ index 86de7f2..0535cac 100644
35 # This file is part of caps strace test. 36 # This file is part of caps strace test.
36 # 37 #
37diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk 38diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk
38index 86de7f2..0535cac 100644 39index c00023b..a56cd56 100644
39--- a/tests/caps-abbrev.awk 40--- a/tests/caps-abbrev.awk
40+++ b/tests/caps-abbrev.awk 41+++ b/tests/caps-abbrev.awk
41@@ -1,4 +1,4 @@ 42@@ -1,4 +1,4 @@
@@ -44,6 +45,3 @@ index 86de7f2..0535cac 100644
44 # 45 #
45 # This file is part of caps strace test. 46 # This file is part of caps strace test.
46 # 47 #
47--
482.10.2
49
diff --git a/meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch b/meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch
new file mode 100644
index 0000000000..a5dccfb08c
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch
@@ -0,0 +1,98 @@
1From 2c8b6de913973274e877639658e9e7273a012adb Mon Sep 17 00:00:00 2001
2From: "Dmitry V. Levin" <ldv@altlinux.org>
3Date: Tue, 8 Jan 2019 19:23:44 +0000
4Subject: [PATCH] mips o32: fix build
5
6Upstream-Status: Backport
7
8Commit 917c2ccf3a67 "Refactor stack pointers" moved mips_REG_* macros
9from linux/mips/arch_regs.h to linux/mips/arch_regs.c because these
10macros are no longer used outside syscall.c or files included by
11syscall.c, but this caused a build regression on mips o32 because
12decode_syscall_subcall() uses mips_REG_SP prior to its definition.
13
14* syscall.c (decode_syscall_subcall): Move ...
15* linux/mips/get_syscall_args.c: ... here.
16
17Reported-by: Baruch Siach <baruch@tkos.co.il>
18Fixes: v4.26~61 "Refactor stack pointers"
19---
20 linux/mips/get_syscall_args.c | 26 ++++++++++++++++++++++++++
21 syscall.c | 27 ++-------------------------
22 2 files changed, 29 insertions(+), 25 deletions(-)
23
24diff --git a/linux/mips/get_syscall_args.c b/linux/mips/get_syscall_args.c
25index 387aa852..e2889f98 100644
26--- a/linux/mips/get_syscall_args.c
27+++ b/linux/mips/get_syscall_args.c
28@@ -37,3 +37,29 @@ arch_get_syscall_args(struct tcb *tcp)
29 #endif
30 return 1;
31 }
32+
33+#ifdef SYS_syscall_subcall
34+static void
35+decode_syscall_subcall(struct tcb *tcp)
36+{
37+ if (!scno_is_valid(tcp->u_arg[0]))
38+ return;
39+ tcp->scno = tcp->u_arg[0];
40+ tcp->qual_flg = qual_flags(tcp->scno);
41+ tcp->s_ent = &sysent[tcp->scno];
42+ memmove(&tcp->u_arg[0], &tcp->u_arg[1],
43+ sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
44+ /*
45+ * Fetching the last arg of 7-arg syscalls (fadvise64_64
46+ * and sync_file_range) requires additional code,
47+ * see linux/mips/get_syscall_args.c
48+ */
49+ if (tcp->s_ent->nargs == MAX_ARGS) {
50+ if (umoven(tcp,
51+ mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
52+ sizeof(tcp->u_arg[0]),
53+ &tcp->u_arg[MAX_ARGS - 1]) < 0)
54+ tcp->u_arg[MAX_ARGS - 1] = 0;
55+ }
56+}
57+#endif /* SYS_syscall_subcall */
58diff --git a/syscall.c b/syscall.c
59index d78f51dd..51fcc721 100644
60--- a/syscall.c
61+++ b/syscall.c
62@@ -349,31 +349,8 @@ decode_ipc_subcall(struct tcb *tcp)
63 #endif /* SYS_ipc_subcall */
64
65 #ifdef SYS_syscall_subcall
66-static void
67-decode_syscall_subcall(struct tcb *tcp)
68-{
69- if (!scno_is_valid(tcp->u_arg[0]))
70- return;
71- tcp->scno = tcp->u_arg[0];
72- tcp->qual_flg = qual_flags(tcp->scno);
73- tcp->s_ent = &sysent[tcp->scno];
74- memmove(&tcp->u_arg[0], &tcp->u_arg[1],
75- sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
76-# ifdef LINUX_MIPSO32
77- /*
78- * Fetching the last arg of 7-arg syscalls (fadvise64_64
79- * and sync_file_range) requires additional code,
80- * see linux/mips/get_syscall_args.c
81- */
82- if (tcp->s_ent->nargs == MAX_ARGS) {
83- if (umoven(tcp,
84- mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
85- sizeof(tcp->u_arg[0]),
86- &tcp->u_arg[MAX_ARGS - 1]) < 0)
87- tcp->u_arg[MAX_ARGS - 1] = 0;
88- }
89-# endif /* LINUX_MIPSO32 */
90-}
91+/* The implementation is architecture specific. */
92+static void decode_syscall_subcall(struct tcb *);
93 #endif /* SYS_syscall_subcall */
94
95 static void
96--
972.17.0
98
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch b/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
index 52096b28cf..b17dcb1d46 100644
--- a/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
+++ b/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
@@ -1,4 +1,4 @@
1From 9f3fd388ae7c46420bccba405468690ed46d669a Mon Sep 17 00:00:00 2001 1From 879ae71c472ce522f1b3514d2abf6ad49b4acc07 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 18 Sep 2017 22:51:32 -0700 3Date: Mon, 18 Sep 2017 22:51:32 -0700
4Subject: [PATCH] tests/sigaction: Check for mips and alpha before using 4Subject: [PATCH] tests/sigaction: Check for mips and alpha before using
@@ -13,17 +13,16 @@ Fixes
13| # define SA_RESTORER_ARGS , new_act->restorer 13| # define SA_RESTORER_ARGS , new_act->restorer
14 14
15Signed-off-by: Khem Raj <raj.khem@gmail.com> 15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17Upstream-Status: Pending
18 16
17---
19 tests/sigaction.c | 2 +- 18 tests/sigaction.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
21 20
22diff --git a/tests/sigaction.c b/tests/sigaction.c 21diff --git a/tests/sigaction.c b/tests/sigaction.c
23index 7b46944..f46cda7 100644 22index 95be197..54819f9 100644
24--- a/tests/sigaction.c 23--- a/tests/sigaction.c
25+++ b/tests/sigaction.c 24+++ b/tests/sigaction.c
26@@ -170,7 +170,7 @@ main(void) 25@@ -156,7 +156,7 @@ main(void)
27 sigdelset(mask.libc, SIGHUP); 26 sigdelset(mask.libc, SIGHUP);
28 27
29 memcpy(new_act->mask, mask.old, sizeof(mask.old)); 28 memcpy(new_act->mask, mask.old, sizeof(mask.old));
@@ -32,6 +31,3 @@ index 7b46944..f46cda7 100644
32 new_act->flags = SA_RESTORER; 31 new_act->flags = SA_RESTORER;
33 new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL; 32 new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL;
34 # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx" 33 # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx"
35--
362.14.1
37
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 460b6e26ee..08fa5c53b8 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,4 +1,4 @@
1From 207fc7814bbeb0241382329215d21fd3b57066f9 Mon Sep 17 00:00:00 2001 1From ef5040b4f15006a22ac63a3bacfceac36ffc2045 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
@@ -14,10 +14,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14 1 file changed, 19 insertions(+) 14 1 file changed, 19 insertions(+)
15 15
16diff --git a/tests/Makefile.am b/tests/Makefile.am 16diff --git a/tests/Makefile.am b/tests/Makefile.am
17index a2f3950..4fa97e2 100644 17index 825c989..4623c48 100644
18--- a/tests/Makefile.am 18--- a/tests/Makefile.am
19+++ b/tests/Makefile.am 19+++ b/tests/Makefile.am
20@@ -34,6 +34,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ 20@@ -14,6 +14,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
21 MPERS_NAME = 21 MPERS_NAME =
22 MPERS_CC_FLAGS = 22 MPERS_CC_FLAGS =
23 ARCH_MFLAGS = 23 ARCH_MFLAGS =
@@ -25,7 +25,7 @@ index a2f3950..4fa97e2 100644
25 AM_CFLAGS = $(WARN_CFLAGS) 25 AM_CFLAGS = $(WARN_CFLAGS)
26 AM_CPPFLAGS = $(ARCH_MFLAGS) \ 26 AM_CPPFLAGS = $(ARCH_MFLAGS) \
27 -I$(builddir) \ 27 -I$(builddir) \
28@@ -490,3 +491,21 @@ BUILT_SOURCES = ksysent.h 28@@ -477,3 +478,21 @@ BUILT_SOURCES = ksysent.h
29 CLEANFILES = ksysent.h 29 CLEANFILES = ksysent.h
30 30
31 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 9e5ec11097..d6354bf4b6 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 bee0680754730498485e24dd037303318c68916c Mon Sep 17 00:00:00 2001 1From ed30a4fc4dc264ce5f5881462e03ae13c921bfed 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,10 +16,10 @@ 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 ad1d00f..96fa205 100644 19index 8045ebd..4319709 100644
20--- a/configure.ac 20--- a/configure.ac
21+++ b/configure.ac 21+++ b/configure.ac
22@@ -32,12 +32,12 @@ 22@@ -12,12 +12,12 @@
23 23
24 AC_PREREQ(2.57) 24 AC_PREREQ(2.57)
25 AC_INIT([strace], 25 AC_INIT([strace],
diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
index b24378bfee..0d3192b345 100644
--- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
+++ b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
@@ -1,3 +1,8 @@
1From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 7 Aug 2016 23:47:57 -0700
4Subject: [PATCH] strace: Fix build with mips/mips64 on musl
5
1SIGEMT is not defined everywhere e.g musl does 6SIGEMT is not defined everywhere e.g musl does
2not define it. Therefore check it being defined 7not define it. Therefore check it being defined
3before using it. 8before using it.
@@ -8,11 +13,15 @@ Fixes errors e.g.
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Upstream-Status: Pending 14Upstream-Status: Pending
10 15
11Index: strace-4.13/tests/signal2name.c 16---
12=================================================================== 17 tests/signal2name.c | 2 ++
13--- strace-4.13.orig/tests/signal2name.c 18 1 file changed, 2 insertions(+)
14+++ strace-4.13/tests/signal2name.c 19
15@@ -42,7 +42,9 @@ signal2name(int sig) 20diff --git a/tests/signal2name.c b/tests/signal2name.c
21index 1d8e7c5..6722aa1 100644
22--- a/tests/signal2name.c
23+++ b/tests/signal2name.c
24@@ -49,7 +49,9 @@ signal2name(int sig)
16 CASE(SIGEMT); 25 CASE(SIGEMT);
17 CASE(SIGLOST); 26 CASE(SIGLOST);
18 #elif defined MIPS 27 #elif defined MIPS
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
index 3d4913d68e..a9bd900da8 100644
--- 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
@@ -1,4 +1,4 @@
1From 154af50ed7ed8b91838d713052ebf29b0b14f765 Mon Sep 17 00:00:00 2001 1From cc97307e8e39a81999c6a365d057487a02e6128e 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:00:00 -0800 3Date: Mon, 18 Jan 2016 11:00:00 -0800
4Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support 4Subject: [PATCH] mpers.m4: more robust test for -m32/-mx32 compile support
@@ -18,15 +18,16 @@ detects the limitations of the OE toolchain.
18Upstream-Status: Pending 18Upstream-Status: Pending
19 19
20Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 20Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
21
21--- 22---
22 m4/mpers.m4 | 2 ++ 23 m4/mpers.m4 | 2 ++
23 1 file changed, 2 insertions(+) 24 1 file changed, 2 insertions(+)
24 25
25Index: strace-4.22/m4/mpers.m4 26diff --git a/m4/mpers.m4 b/m4/mpers.m4
26=================================================================== 27index 13725d7..d8578ea 100644
27--- strace-4.22.orig/m4/mpers.m4 28--- a/m4/mpers.m4
28+++ strace-4.22/m4/mpers.m4 29+++ b/m4/mpers.m4
29@@ -108,6 +108,7 @@ case "$arch" in 30@@ -88,6 +88,7 @@ case "$arch" in
30 CFLAGS="$CFLAGS MPERS_CFLAGS $IFLAG" 31 CFLAGS="$CFLAGS MPERS_CFLAGS $IFLAG"
31 AC_CACHE_CHECK([for mpers_name personality compile support], [st_cv_cc], 32 AC_CACHE_CHECK([for mpers_name personality compile support], [st_cv_cc],
32 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> 33 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
@@ -34,7 +35,7 @@ Index: strace-4.22/m4/mpers.m4
34 int main(){return 0;}]])], 35 int main(){return 0;}]])],
35 [st_cv_cc=yes], 36 [st_cv_cc=yes],
36 [st_cv_cc=no])]) 37 [st_cv_cc=no])])
37@@ -115,6 +116,7 @@ case "$arch" in 38@@ -95,6 +96,7 @@ case "$arch" in
38 AC_CACHE_CHECK([for mpers_name personality runtime support], 39 AC_CACHE_CHECK([for mpers_name personality runtime support],
39 [st_cv_runtime], 40 [st_cv_runtime],
40 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h> 41 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdint.h>
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
index f6ffa8e7a8..7077048c75 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 3836518c46bd5bb3e71371b1b18274bf2d487133 Mon Sep 17 00:00:00 2001 1From f0d7ebf48441e0b090c3e6053b8c845d0a4a3b18 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
@@ -11,6 +11,7 @@ from #!/bin/gawk to #!/usr/bin/gawk. Fixes missing RDPENDS QA tests:
11Upstream-Status: Inappropriate [configuration] 11Upstream-Status: Inappropriate [configuration]
12 12
13Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 13Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
14
14--- 15---
15 mpers.awk | 2 +- 16 mpers.awk | 2 +-
16 tests-m32/caps.awk | 2 +- 17 tests-m32/caps.awk | 2 +-
@@ -25,7 +26,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
25 10 files changed, 10 insertions(+), 10 deletions(-) 26 10 files changed, 10 insertions(+), 10 deletions(-)
26 27
27diff --git a/mpers.awk b/mpers.awk 28diff --git a/mpers.awk b/mpers.awk
28index fe54763..b5238a8 100644 29index 17f8f2b..d69dcd5 100644
29--- a/mpers.awk 30--- a/mpers.awk
30+++ b/mpers.awk 31+++ b/mpers.awk
31@@ -1,4 +1,4 @@ 32@@ -1,4 +1,4 @@
@@ -35,7 +36,7 @@ index fe54763..b5238a8 100644
35 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> 36 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
36 # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org> 37 # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
37diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk 38diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk
38index c6e31ef..5efc6cc 100644 39index 941564a..0bcc3ff 100644
39--- a/tests-m32/caps.awk 40--- a/tests-m32/caps.awk
40+++ b/tests-m32/caps.awk 41+++ b/tests-m32/caps.awk
41@@ -1,4 +1,4 @@ 42@@ -1,4 +1,4 @@
@@ -45,17 +46,17 @@ index c6e31ef..5efc6cc 100644
45 # This file is part of caps strace test. 46 # This file is part of caps strace test.
46 # 47 #
47diff --git a/tests-m32/match.awk b/tests-m32/match.awk 48diff --git a/tests-m32/match.awk b/tests-m32/match.awk
48index abfbae9..f2740bf 100644 49index d91c518..ee5d908 100644
49--- a/tests-m32/match.awk 50--- a/tests-m32/match.awk
50+++ b/tests-m32/match.awk 51+++ b/tests-m32/match.awk
51@@ -1,4 +1,4 @@ 52@@ -1,4 +1,4 @@
52-#!/bin/gawk 53-#!/bin/gawk
53+#!/usr/bin/gawk 54+#!/usr/bin/gawk
54 # 55 #
55 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 56 # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org>
56 # All rights reserved. 57 # All rights reserved.
57diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk 58diff --git a/tests-m32/rt_sigaction.awk b/tests-m32/rt_sigaction.awk
58index 9c3a9ed..8414243 100644 59index 81dd813..9cd9549 100644
59--- a/tests-m32/rt_sigaction.awk 60--- a/tests-m32/rt_sigaction.awk
60+++ b/tests-m32/rt_sigaction.awk 61+++ b/tests-m32/rt_sigaction.awk
61@@ -1,4 +1,4 @@ 62@@ -1,4 +1,4 @@
@@ -65,7 +66,7 @@ index 9c3a9ed..8414243 100644
65 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 66 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
66 # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> 67 # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
67diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk 68diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk
68index c6e31ef..5efc6cc 100644 69index 941564a..0bcc3ff 100644
69--- a/tests-mx32/caps.awk 70--- a/tests-mx32/caps.awk
70+++ b/tests-mx32/caps.awk 71+++ b/tests-mx32/caps.awk
71@@ -1,4 +1,4 @@ 72@@ -1,4 +1,4 @@
@@ -75,17 +76,17 @@ index c6e31ef..5efc6cc 100644
75 # This file is part of caps strace test. 76 # This file is part of caps strace test.
76 # 77 #
77diff --git a/tests-mx32/match.awk b/tests-mx32/match.awk 78diff --git a/tests-mx32/match.awk b/tests-mx32/match.awk
78index abfbae9..f2740bf 100644 79index d91c518..ee5d908 100644
79--- a/tests-mx32/match.awk 80--- a/tests-mx32/match.awk
80+++ b/tests-mx32/match.awk 81+++ b/tests-mx32/match.awk
81@@ -1,4 +1,4 @@ 82@@ -1,4 +1,4 @@
82-#!/bin/gawk 83-#!/bin/gawk
83+#!/usr/bin/gawk 84+#!/usr/bin/gawk
84 # 85 #
85 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 86 # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org>
86 # All rights reserved. 87 # All rights reserved.
87diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk 88diff --git a/tests-mx32/rt_sigaction.awk b/tests-mx32/rt_sigaction.awk
88index 9c3a9ed..8414243 100644 89index 81dd813..9cd9549 100644
89--- a/tests-mx32/rt_sigaction.awk 90--- a/tests-mx32/rt_sigaction.awk
90+++ b/tests-mx32/rt_sigaction.awk 91+++ b/tests-mx32/rt_sigaction.awk
91@@ -1,4 +1,4 @@ 92@@ -1,4 +1,4 @@
@@ -95,7 +96,7 @@ index 9c3a9ed..8414243 100644
95 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 96 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
96 # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> 97 # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
97diff --git a/tests/caps.awk b/tests/caps.awk 98diff --git a/tests/caps.awk b/tests/caps.awk
98index c6e31ef..5efc6cc 100644 99index 941564a..0bcc3ff 100644
99--- a/tests/caps.awk 100--- a/tests/caps.awk
100+++ b/tests/caps.awk 101+++ b/tests/caps.awk
101@@ -1,4 +1,4 @@ 102@@ -1,4 +1,4 @@
@@ -105,17 +106,17 @@ index c6e31ef..5efc6cc 100644
105 # This file is part of caps strace test. 106 # This file is part of caps strace test.
106 # 107 #
107diff --git a/tests/match.awk b/tests/match.awk 108diff --git a/tests/match.awk b/tests/match.awk
108index abfbae9..f2740bf 100644 109index d91c518..ee5d908 100644
109--- a/tests/match.awk 110--- a/tests/match.awk
110+++ b/tests/match.awk 111+++ b/tests/match.awk
111@@ -1,4 +1,4 @@ 112@@ -1,4 +1,4 @@
112-#!/bin/gawk 113-#!/bin/gawk
113+#!/usr/bin/gawk 114+#!/usr/bin/gawk
114 # 115 #
115 # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org> 116 # Copyright (c) 2014-2018 Dmitry V. Levin <ldv@altlinux.org>
116 # All rights reserved. 117 # All rights reserved.
117diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk 118diff --git a/tests/rt_sigaction.awk b/tests/rt_sigaction.awk
118index 9c3a9ed..8414243 100644 119index 81dd813..9cd9549 100644
119--- a/tests/rt_sigaction.awk 120--- a/tests/rt_sigaction.awk
120+++ b/tests/rt_sigaction.awk 121+++ b/tests/rt_sigaction.awk
121@@ -1,4 +1,4 @@ 122@@ -1,4 +1,4 @@
diff --git a/meta/recipes-devtools/strace/strace_4.25.bb b/meta/recipes-devtools/strace/strace_4.26.bb
index 028aa71729..24f92c99e5 100644
--- a/meta/recipes-devtools/strace/strace_4.25.bb
+++ b/meta/recipes-devtools/strace/strace_4.26.bb
@@ -1,8 +1,8 @@
1SUMMARY = "System call tracing tool" 1SUMMARY = "System call tracing tool"
2HOMEPAGE = "http://strace.io" 2HOMEPAGE = "http://strace.io"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "BSD" 4LICENSE = "LGPL-2.1+ & GPL-2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=6ddb91734b9c705f3e87362e97e5f64b" 5LIC_FILES_CHKSUM = "file://COPYING;md5=5c84d1c6e48e7961ccd2cd2ae32f7bf1"
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 \
@@ -14,9 +14,10 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
14 file://mips-SIGEMT.patch \ 14 file://mips-SIGEMT.patch \
15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ 16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
17 file://0001-mips-o32-fix-build.patch \
17 " 18 "
18SRC_URI[md5sum] = "fa5ac841e9ce6af133061822898d49a9" 19SRC_URI[md5sum] = "daa51acc0c7c696221ec03cf0b30a7af"
19SRC_URI[sha256sum] = "d685f8e65470b7832c3aff60c57ab4459f26ff89f07c10f92bd70ee89efac701" 20SRC_URI[sha256sum] = "7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c"
20 21
21inherit autotools ptest bluetooth 22inherit autotools ptest bluetooth
22 23