summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch37
-rw-r--r--package/etrax-tools/src/e100boot/Makefile2
-rw-r--r--package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c1
-rw-r--r--target/config/Config.in.libc6
-rw-r--r--target/cris/systems/foxboard-lx8321
-rw-r--r--toolchain/gdb/Makefile.inc2
-rw-r--r--toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch32
-rw-r--r--toolchain/uclibc-ng/Makefile.inc8
8 files changed, 80 insertions, 9 deletions
diff --git a/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch
new file mode 100644
index 000000000..1dfd6f379
--- /dev/null
+++ b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch
@@ -0,0 +1,37 @@
+From 34d331d642c3312e1c04e4650f547f1a67abee24 Mon Sep 17 00:00:00 2001
+From: Andrej Valek <andrej.v@skyrain.eu>
+Date: Wed, 16 Oct 2024 10:15:08 +0200
+Subject: [PATCH] syslogd: fix wrong OPT_locallog flag detection
+
+The OPT_locallog was set on "option_mask32" but checked on local
+"opts" variable. While this flag it's used on multiple places can't be
+has to be used with "option_mask32". Without this change syslogd
+is more-less unusable while no messages are logged locally.
+
+Signed-off-by: Andrej Valek <andrej.v@skyrain.eu>
+Upstream: https://lists.busybox.net/pipermail/busybox/2024-October/090969.html
+[Thomas: this was reported as beeing needed by Bernd Kuhls at
+https://lore.kernel.org/buildroot/pan$de0bb$35c5a64$ca9b6f21$2408ff40@ID-313208.user.individual.net/,
+but also on the Busybox mailing list at
+https://lists.busybox.net/pipermail/busybox/2023-September/090499.html]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ sysklogd/syslogd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
+index 7558051f0..fa03aa280 100644
+--- a/sysklogd/syslogd.c
++++ b/sysklogd/syslogd.c
+@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
+ }
+ }
+ #endif
+- if (!ENABLE_FEATURE_REMOTE_LOG || (opts & OPT_locallog)) {
++ if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
+ recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
+ split_escape_and_log(recvbuf, sz);
+ }
+--
+2.48.1
+
diff --git a/package/etrax-tools/src/e100boot/Makefile b/package/etrax-tools/src/e100boot/Makefile
index 828b40221..f8e4ced02 100644
--- a/package/etrax-tools/src/e100boot/Makefile
+++ b/package/etrax-tools/src/e100boot/Makefile
@@ -11,7 +11,7 @@ INSTALL_PATH = /usr/local
INSTALL_PATH_BIN = $(INSTALL_PATH)/bin
INSTALL_PATH_DOC = $(INSTALL_PATH)/man/man1
-DIRS = libpcap-0.4 sbl doc
+DIRS = libpcap-0.4 sbl
-include $(AXIS_TOP_DIR)/tools/build/Rules.axis
ifdef prefix
diff --git a/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c b/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c
index 089ea0ab8..1adc8ef95 100644
--- a/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c
+++ b/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c
@@ -37,6 +37,7 @@ static const char rcsid[] =
#include <linux/if_ether.h>
#include <netinet/in.h>
+#include <linux/sockios.h>
#include <errno.h>
#include <malloc.h>
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 2cb1fccec..7f3157976 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -148,8 +148,8 @@ choice
prompt "Target C library version"
depends on !ADK_TARGET_CHOOSE_ARCH
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_51
- bool "1.0.51"
+config ADK_TARGET_LIB_UCLIBC_NG_1_0_52
+ bool "1.0.52"
depends on ADK_TARGET_LIB_UCLIBC_NG
config ADK_TARGET_LIB_UCLIBC_NG_GIT
@@ -198,7 +198,7 @@ config ADK_TARGET_LIBC
config ADK_LIBC_VERSION
string
- default "1.0.51" if ADK_TARGET_LIB_UCLIBC_NG_1_0_51
+ default "1.0.52" if ADK_TARGET_LIB_UCLIBC_NG_1_0_52
default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5
default "2.41" if ADK_TARGET_LIB_GLIBC_2_40
default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0
diff --git a/target/cris/systems/foxboard-lx832 b/target/cris/systems/foxboard-lx832
index 82eaad093..4ef104a95 100644
--- a/target/cris/systems/foxboard-lx832
+++ b/target/cris/systems/foxboard-lx832
@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_FOXBOARD_LX832
bool "Foxboard LX832"
select ADK_TARGET_CPU_CRIS_CRISV10
select ADK_TARGET_WITH_MTD
+ select ADK_TARGET_WITH_NETDEVICE
select ADK_TARGET_KERNEL_ZIMAGE
select ADK_TARGET_KERNEL_WITH_COMPRESSION
help
diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc
index 0fac2ecb9..e8e29d4c3 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -42,7 +42,7 @@ ifeq ($(ADK_TOOLCHAIN_GDB_H8300_GIT),y)
PKG_VERSION:= ysato-h8300
PKG_RELEASE:= 1
PKG_GIT:= branch
-PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/binutils_gdb.git
+PKG_SITES:= https://github.com/ysat0/binutils-gdb.git
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
ifeq ($(ADK_TOOLCHAIN_GDB_GIT),y)
diff --git a/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch b/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch
new file mode 100644
index 000000000..bbae1d774
--- /dev/null
+++ b/toolchain/gdb/patches/ysato-h8300/no_extern_inline.patch
@@ -0,0 +1,32 @@
+--- a/sim/common/sim-arange.c
++++ b/sim/common/sim-arange.c
+@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a
+ build_search_tree (ar);
+ }
+
+-#endif /* DEFINE_NON_INLINE_P */
+-
+-#if DEFINE_INLINE_P
+-
+-SIM_ARANGE_INLINE int
++int
+ sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr)
+ {
+ ADDR_RANGE_TREE *t = ar->range_tree;
+@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad
+ return 0;
+ }
+
+-#endif /* DEFINE_INLINE_P */
++#endif /* DEFINE_NON_INLINE_P */
+--- a/sim/common/sim-arange.h
++++ b/sim/common/sim-arange.h
+@@ -62,7 +62,7 @@ extern void sim_addr_range_delete (ADDR_
+
+ /* Return non-zero if ADDR is in range AR, traversing the entire tree.
+ If no range is specified, that is defined to mean "everything". */
+-extern INLINE int
++extern int
+ sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
+ #define ADDR_RANGE_HIT_P(ar, addr) \
+ ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc
index 1f89a22b1..cff7d83f6 100644
--- a/toolchain/uclibc-ng/Makefile.inc
+++ b/toolchain/uclibc-ng/Makefile.inc
@@ -7,10 +7,10 @@ PKG_VERSION:= git
PKG_RELEASE:= 1
PKG_SITES:= https://git.uclibc-ng.org/git/uclibc-ng.git
endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_51),y)
-PKG_VERSION:= 1.0.51
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_52),y)
+PKG_VERSION:= 1.0.52
PKG_RELEASE:= 1
-PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.51/
-PKG_HASH:= 46f772e5192605f422ae190526c9d867eb715271da1937bd37afb754e18e730e
+PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.52/
+PKG_HASH:= 8c70b76f11d78c6b3b1608d74016387d292c35793efec820a377c74dfc850dad
endif
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 16:34:27 +0000