Skip to contentSkip to conversation

strace: overlay 4.26 from oe-core/master

PATCH New Denys Dmytriyenko 1 participant 2 messages Feb 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 strace: overlay 4.26 from oe-core/master

Thud comes with strace 4.24 that can't build against 4.19 kernel, due to changed header API.

---
 ...hen-using-non-glibc-libc-implementation-o.patch |  34 ++++++
 .../0001-caps-abbrev.awk-fix-gawk-s-path.patch     |  47 ++++++++
 .../strace/strace/0001-mips-o32-fix-build.patch    |  98 ++++++++++++++++
 ...tion-Check-for-mips-and-alpha-before-usin.patch |  34 ++++++
 .../strace/strace/Makefile-ptest.patch             |  49 ++++++++
 .../strace/strace/disable-git-version-gen.patch    |  37 ++++++
 .../strace/strace/mips-SIGEMT.patch                |  33 ++++++
 ...-robust-test-for-m32-mx32-compile-support.patch |  45 ++++++++
 .../recipes-devtools/strace/strace/run-ptest       |   2 +
 .../strace/strace/update-gawk-paths.patch          | 127 +++++++++++++++++++++
 .../recipes-devtools/strace/strace_4.26.bb         |  57 +++++++++
 11 files changed, 563 insertions(+)
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/Makefile-ptest.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/disable-git-version-gen.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/mips-SIGEMT.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
 create mode 100755 meta-arago-distro/recipes-devtools/strace/strace/run-ptest
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace/update-gawk-paths.patch
 create mode 100644 meta-arago-distro/recipes-devtools/strace/strace_4.26.bb
meta-arago-distro/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch new file +34 -0
new file mode 100644
index 0000000..daafceb
@@ -0,0 +1,34 @@
+From af1fdce78bff4343f3c84ea118abdc3c739fc646 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+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 <[email protected]>
+
+---
+ ptrace.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ptrace.h b/ptrace.h
+index 89d4b95..b3f45bb 100644
+--- a/ptrace.h
++++ b/ptrace.h
+@@ -30,7 +30,13 @@
+ # 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
meta-arago-distro/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch new file +47 -0

47 lines not on this page · raw message

meta-arago-distro/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch new file +98 -0

98 lines not on this page · raw message

meta-arago-distro/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch new file +34 -0
new file mode 100644
index 0000000..becee79
@@ -0,0 +1,34 @@
+From 879ae71c472ce522f1b3514d2abf6ad49b4acc07 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+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 <[email protected]>
+
+---
+ tests/sigaction.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/sigaction.c b/tests/sigaction.c
+index 95be197..54819f9 100644
+--- 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"
meta-arago-distro/recipes-devtools/strace/strace/Makefile-ptest.patch new file +49 -0

49 lines not on this page · raw message

meta-arago-distro/recipes-devtools/strace/strace/disable-git-version-gen.patch new file +37 -0
new file mode 100644
index 0000000..d6354bf
@@ -0,0 +1,37 @@
+From ed30a4fc4dc264ce5f5881462e03ae13c921bfed Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <[email protected]>
+Date: Mon, 18 Jan 2016 13:33:50 -0800
+Subject: [PATCH] strace: remove need for scripts
+
+git-version-gen copyright-year-gen file-date-gen are not included in
+tarball releases, so we need to avoid attempts to call them.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andre McCurdy <[email protected]>
+Signed-off-by: Anuj Mittal <[email protected]>
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8045ebd..4319709 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,12 +12,12 @@
+ 
+ AC_PREREQ(2.57)
+ AC_INIT([strace],
+-	m4_esyscmd([./git-version-gen .tarball-version]),
++	m4_esyscmd_s([cat .tarball-version]),
+ 	[[email protected]],
+ 	[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], 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.])
+ AC_CONFIG_SRCDIR([strace.c])
+ AC_CONFIG_AUX_DIR([.])
meta-arago-distro/recipes-devtools/strace/strace/mips-SIGEMT.patch new file +33 -0
new file mode 100644
index 0000000..0d3192b
@@ -0,0 +1,33 @@
+From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+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.
+
+Fixes errors e.g.
+../../strace-4.13/tests/signal2name.c:45:7: error: 'SIGEMT' undeclared (first use in this function)
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+---
+ 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
++#ifdef SIGEMT
+ 	CASE(SIGEMT);
++#endif
+ 	CASE(SIGIOT);
+ 	CASE(SIGPWR);
+ #else
meta-arago-distro/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch new file +45 -0

45 lines not on this page · raw message

meta-arago-distro/recipes-devtools/strace/strace/run-ptest new file +2 -0
new file mode 100755
index 0000000..8070d83
@@ -0,0 +1,2 @@
+#!/bin/sh
+make -B -C tests -k test-suite.log
meta-arago-distro/recipes-devtools/strace/strace/update-gawk-paths.patch new file +127 -0

127 lines not on this page · raw message

meta-arago-distro/recipes-devtools/strace/strace_4.26.bb new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 external-arm-toolchain: update linux-libc-headers to 4.19

---
 .../meta/external-arm-toolchain.bbappend           | 23 ++++++----------------
 1 file changed, 6 insertions(+), 17 deletions(-)
meta-arago-distro/recipes-core/meta/external-arm-toolchain.bbappend +6 -17
index 8b947d1..46c44cb 100644
@@ -3,20 +3,22 @@
 # on linux-libc-headers creates circular dependencies now. Mostly
 # duplication of code from corresponding recipe.
 
-BRANCH = "ti-lsk-linux-4.14.y"
-SRCREV = "3e50654361c34b75784ab7c8c9aa8e96b3a37fc1"
+BRANCH = "ti-linux-4.19.y"
+SRCREV = "8de817772462078a064b70d368eeae3b92a31439"
 
 KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
 KERNEL_GIT_PROTOCOL = "git"
 SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH}"
 
-PKGV_linux-libc-headers-dev = "4.14"
-PKGV_linux-libc-headers = "4.14"
+PKGV_linux-libc-headers-dev = "4.19"
+PKGV_linux-libc-headers = "4.19"
 
 inherit kernel-arch pkgconfig multilib_header
 
 EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}""
 
+DEPENDS += "bison-native"
+
 do_configure_append() {
 	cd ${WORKDIR}/git
 	oe_runmake allnoconfig
@@ -32,16 +34,3 @@ do_install_append() {
 	# The ..install.cmd conflicts between various configure runs
 	find ${D}${exec_prefix} -name ..install.cmd | xargs rm -f
 }
-
-do_install_append_aarch64 () {
-        do_install_asm_armmultilib
-}
-
-do_install_append_arm () {
-	do_install_asm_armmultilib
-}
-
-do_install_asm_armmultilib () {
-	oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/mman.h asm/param.h asm/perf_regs.h
-	oe_multilib_header asm/posix_types.h asm/ptrace.h  asm/setup.h  asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h  asm/statfs.h asm/swab.h  asm/types.h asm/unistd.h
-}
Signature · 1 line
2.7.4