Bump buildroot to 2019.02

This commit is contained in:
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions

View File

@@ -0,0 +1,49 @@
From 1b657bf8e2f4bf6f80b969b220900003d7ecbce6 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 8 Jan 2019 18:28:37 +0200
Subject: [PATCH] Fix build for no-MMU targets
Commit 7488ce9e23f1 ("Check whether PTRACE_GET_SYSCALL_INFO is supported
by the kernel") added a fork() call in test_ptrace_get_syscall_info()
which is included in the main strace executable code. Although the
test_ptrace_get_syscall_info() routine is not called on no-MMU targets,
the compiler can't optimize it out because it is a global symbol. So
build for no-MMU targets currently fails:
strace-ptrace_syscall_info.o: In function `test_ptrace_get_syscall_info':
ptrace_syscall_info.c:(.text+0x1c): undefined reference to `fork'
Make the test_ptrace_get_syscall_info() definition depend on HAVE_FORK
to fix that.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status:
https://lists.strace.io/pipermail/strace-devel/2019-January/008596.html
ptrace_syscall_info.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ptrace_syscall_info.c b/ptrace_syscall_info.c
index 55eafddf7f71..cc6ce149649e 100644
--- a/ptrace_syscall_info.c
+++ b/ptrace_syscall_info.c
@@ -40,6 +40,7 @@ static const unsigned int expected_seccomp_size =
* Test that PTRACE_GET_SYSCALL_INFO API is supported by the kernel, and
* that the semantics implemented in the kernel matches our expectations.
*/
+#ifdef HAVE_FORK
bool
test_ptrace_get_syscall_info(void)
{
@@ -255,6 +256,7 @@ done:
return ptrace_get_syscall_info_supported;
}
+#endif /* HAVE_FORK */
void
print_ptrace_syscall_info(struct tcb *tcp, kernel_ulong_t addr,
--
2.20.1

View File

@@ -0,0 +1,68 @@
From 8150854b5dd030a47f601931daf827ca33bc9bd9 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 8 Jan 2019 19:52:21 +0200
Subject: [PATCH] Fix build for mips targets
Commit 917c2ccf3a67 ("Refactor stack pointers") removed
linux/mips/arch_regs.h that defines mips_REG_* macros and struct
mips_regs. These symbols are referenced in mips code. Restore
arch_regs.h to fix the build failure:
syscall.c: In function 'decode_syscall_subcall':
syscall.c:370:7: error: 'mips_REG_SP' undeclared (first use in this function)
mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
^~~~~~~~~~~
[ baruch: drop the Makefile.in hunk to avoid autoreconf ]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status:
https://lists.strace.io/pipermail/strace-devel/2019-January/008598.html
linux/mips/arch_regs.c | 4 +---
linux/mips/arch_regs.h | 18 ++++++++++++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 linux/mips/arch_regs.h
diff --git a/linux/mips/arch_regs.c b/linux/mips/arch_regs.c
index 0874e31efea4..3ed841ee7c1a 100644
--- a/linux/mips/arch_regs.c
+++ b/linux/mips/arch_regs.c
@@ -5,9 +5,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-static struct {
- uint64_t uregs[38];
-} mips_regs;
+struct mips_regs mips_regs; /* not static */
#define REG_V0 2
#define REG_A0 4
diff --git a/linux/mips/arch_regs.h b/linux/mips/arch_regs.h
new file mode 100644
index 000000000000..6372badce646
--- /dev/null
+++ b/linux/mips/arch_regs.h
@@ -0,0 +1,18 @@
+struct mips_regs {
+ uint64_t uregs[38];
+};
+
+extern struct mips_regs mips_regs;
+
+#define REG_V0 2
+#define REG_A0 4
+
+#define mips_REG_V0 mips_regs.uregs[REG_V0]
+#define mips_REG_A0 mips_regs.uregs[REG_A0 + 0]
+#define mips_REG_A1 mips_regs.uregs[REG_A0 + 1]
+#define mips_REG_A2 mips_regs.uregs[REG_A0 + 2]
+#define mips_REG_A3 mips_regs.uregs[REG_A0 + 3]
+#define mips_REG_A4 mips_regs.uregs[REG_A0 + 4]
+#define mips_REG_A5 mips_regs.uregs[REG_A0 + 5]
+#define mips_REG_SP mips_regs.uregs[29]
+#define mips_REG_EPC mips_regs.uregs[34]
--
2.20.1

View File

@@ -7,6 +7,9 @@ config BR2_PACKAGE_STRACE
Allows you to track what system calls a program makes
while it is running.
If you want 'strace -k' to work, make sure to enable the
'libunwind' package.
https://strace.io
comment "strace needs a toolchain w/ headers >= 4.0 on nios2"

View File

@@ -1,7 +1,5 @@
# From https://sourceforge.net/projects/strace/files/strace/4.20/
md5 f2271ab0fac49ebee9cbd7f3469227cb strace-4.20.tar.xz
sha1 9cebc754af3434e4027a07745770892f685c0316 strace-4.20.tar.xz
# Locally calculated after checking signature
# https://sourceforge.net/projects/strace/files/strace/4.20/strace-4.20.tar.xz.asc
sha256 5bf3148dd17306a42566f7da17368fdd781afa147db05ea63a4ca2b50f58c523 strace-4.20.tar.xz
sha256 ea7ff222f36c9df0aa2924a8f7c7d2aec3ea11e752feba4b15ec79b695b6236a COPYING
# Locally calculated after checking signature with RSA key 0xA8041FA839E16E36
# https://strace.io/files/4.26/strace-4.26.tar.xz
sha256 7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c strace-4.26.tar.xz
sha256 ba6d645dfe0f5e13bf1f117f0595e90076b845fc9aaa1d5778699792bb2d70b2 COPYING
sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later

View File

@@ -4,11 +4,12 @@
#
################################################################################
STRACE_VERSION = 4.20
STRACE_VERSION = 4.26
STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
STRACE_LICENSE = BSD-3-Clause
STRACE_LICENSE_FILES = COPYING
STRACE_SITE = https://strace.io/files/$(STRACE_VERSION)
STRACE_LICENSE = LGPL-2.1+
STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later
STRACE_CONF_OPTS = --enable-mpers=check
# strace bundle some kernel headers to build libmpers, this mixes userspace
# headers and kernel headers which break the build with musl.
@@ -18,10 +19,27 @@ STRACE_CONF_OPTS += st_cv_m32_mpers=no \
st_cv_mx32_mpers=no
endif
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
STRACE_DEPENDENCIES += libunwind
STRACE_CONF_OPTS += --with-libunwind
else
STRACE_CONF_OPTS += --without-libunwind
endif
# Demangling symbols in stack trace needs libunwind and libiberty.
ifeq ($(BR2_PACKAGE_BINUTILS)$(BR2_PACKAGE_LIBUNWIND),yy)
STRACE_DEPENDENCIES += binutils
STRACE_CONF_OPTS += --with-libiberty=check
else
STRACE_CONF_OPTS += --without-libiberty
endif
ifeq ($(BR2_PACKAGE_PERL),)
define STRACE_REMOVE_STRACE_GRAPH
rm -f $(TARGET_DIR)/usr/bin/strace-graph
endef
STRACE_POST_INSTALL_TARGET_HOOKS += STRACE_REMOVE_STRACE_GRAPH
endif
$(eval $(autotools-package))