From fdddeb485e87a0cf75cce78d00fed8198e2ce7a4 Mon Sep 17 00:00:00 2001 From: "Philip A. Prindeville" Date: Sun, 5 Jul 2026 12:48:01 -0600 Subject: [PATCH 1/2] fluent-bit: fix CI/CD tests Getting segfault because stack size is inadequate. Fixes: https://github.com/openwrt/packages/issues/29777 Signed-off-by: Philip A. Prindeville --- admin/fluent-bit/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/fluent-bit/Makefile b/admin/fluent-bit/Makefile index 7bb7b47798b78..50b922143fc31 100644 --- a/admin/fluent-bit/Makefile +++ b/admin/fluent-bit/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fluent-bit PKG_VERSION:=4.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git @@ -44,6 +44,7 @@ CMAKE_OPTIONS+= \ -DFLB_BACKTRACE=No \ -DFLB_WASM=No \ -DFLB_LUAJIT=No \ + -DFLB_CORO_STACK_SIZE=4096 \ -DWITH_SASL=No \ -DWITH_ZLIB=No \ -DWITH_ZSTD=No From 6cd3e6b28a9b7a8615db25cbd89c4a6808f78f47 Mon Sep 17 00:00:00 2001 From: "Philip A. Prindeville" Date: Sun, 21 Jun 2026 15:55:19 -0600 Subject: [PATCH 2/2] treewide: homogenize references to libfts for MUSL The way we use -lfts isn't particularly consistent. There's no reason it shouldn't be. glibc users shouldn't have to deal with someone else's lack of rigor. Signed-off-by: Philip A. Prindeville --- admin/fluent-bit/Makefile | 2 +- lang/python/python-selinux/Makefile | 4 ++-- net/nfdump/Makefile | 4 ++-- net/tcpreplay/Makefile | 9 +++------ utils/exfatprogs/Makefile | 4 +++- utils/nnn/Makefile | 4 +++- utils/nnn/patches/musl-fts.patch | 11 ----------- 7 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 utils/nnn/patches/musl-fts.patch diff --git a/admin/fluent-bit/Makefile b/admin/fluent-bit/Makefile index 50b922143fc31..a3a0840a45197 100644 --- a/admin/fluent-bit/Makefile +++ b/admin/fluent-bit/Makefile @@ -34,7 +34,7 @@ define Package/fluent-bit/conffiles /etc/fluent-bit/parsers.conf endef -TARGET_LDFLAGS +=-lfts -latomic +TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts) -latomic CMAKE_OPTIONS+= \ -DFLB_RELEASE=Yes \ diff --git a/lang/python/python-selinux/Makefile b/lang/python/python-selinux/Makefile index 8d628b3e0c238..af7cf810df374 100644 --- a/lang/python/python-selinux/Makefile +++ b/lang/python/python-selinux/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-selinux PKG_VERSION:=3.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 SRC_NAME:=libselinux PKG_SOURCE:=$(SRC_NAME)-$(PKG_VERSION).tar.gz @@ -34,7 +34,7 @@ define Package/python3-selinux SECTION:=lang CATEGORY:=Languages TITLE:=SELinux runtime library bindings - DEPENDS:=+python3-light +libselinux + DEPENDS:=+python3-light +libselinux +USE_MUSL:musl-fts URL:=https://github.com/selinuxproject endef diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile index f844d3ed03865..0b52d5b93693f 100644 --- a/net/nfdump/Makefile +++ b/net/nfdump/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfdump PKG_VERSION:=1.7.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) @@ -42,7 +42,7 @@ define Package/nfdump/conffiles /etc/config/nfcapd endef -TARGET_LDFLAGS += -Wl,--as-needed $(if $(CONFIG_USE_MUSL),-lfts) +TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts) define Package/nfdump/install $(INSTALL_DIR) $(1)/usr/lib diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index da3e9f54b3253..eba59d6e65229 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcpreplay PKG_VERSION:=4.5.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION) @@ -80,7 +80,7 @@ $(call Package/tcpreplay/default) endef define Package/tcpbridge/description - tcpbridge is a tool for selectively briding network traffic across two + tcpbridge is a tool for selectively bridging network traffic across two interfaces and optionally modifying the packets in between endef @@ -127,10 +127,6 @@ define Package/tcpreplay-all/description to support switches, routers, and IP Flow/NetFlow appliances. endef -ifneq ($(CONFIG_USE_MUSL),) - TARGET_LDFLAGS+= -lfts -endif - CONFIGURE_VARS += \ ac_cv_lib_nl_nl_cache_alloc=no \ ac_cv_lib_nl_genl_3_genl_connect=no \ @@ -144,6 +140,7 @@ CONFIGURE_ARGS += \ --with-libpcap="$(STAGING_DIR)/usr" TARGET_CFLAGS += -std=gnu11 +TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts) define tcpreplayTemplate define Package/$(1)/install diff --git a/utils/exfatprogs/Makefile b/utils/exfatprogs/Makefile index dd45260b78000..536a99c493be6 100644 --- a/utils/exfatprogs/Makefile +++ b/utils/exfatprogs/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=exfatprogs PKG_VERSION:=1.4.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/exfatprogs/exfatprogs/releases/download/$(PKG_VERSION) @@ -40,6 +40,8 @@ CONFIGURE_ARGS += \ --enable-shared \ --disable-static +TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts) + define Package/exfat-mkfs/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.exfat $(1)/usr/sbin diff --git a/utils/nnn/Makefile b/utils/nnn/Makefile index fc43a9ec71303..ffb1114533649 100644 --- a/utils/nnn/Makefile +++ b/utils/nnn/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nnn PKG_VERSION:=5.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jarun/nnn/tar.gz/v$(PKG_VERSION)? @@ -35,4 +35,6 @@ define Package/nnn/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/nnn $(1)/usr/bin endef +TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts) + $(eval $(call BuildPackage,nnn)) diff --git a/utils/nnn/patches/musl-fts.patch b/utils/nnn/patches/musl-fts.patch deleted file mode 100644 index f2e62125c7661..0000000000000 --- a/utils/nnn/patches/musl-fts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -165,7 +165,7 @@ CFLAGS += -std=c11 -Wall -Wextra -Wshado - CFLAGS += $(CFLAGS_OPTIMIZATION) - CFLAGS += $(CFLAGS_CURSES) - --LDLIBS += $(LDLIBS_CURSES) -lpthread -+LDLIBS += $(LDLIBS_CURSES) -lpthread -lfts - - # static compilation needs libgpm development package - ifeq ($(strip $(O_STATIC)),1)