mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 08:30:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/fluent-bit: bump to 4.0.9

Browse Source 
News:
 - https://fluentbit.io/announcements/v4.0.4/
 - https://fluentbit.io/announcements/v4.0.5/
 - https://fluentbit.io/announcements/v4.0.6/
 - https://fluentbit.io/announcements/v4.0.7/
 - https://fluentbit.io/announcements/v4.0.8/
 - https://fluentbit.io/announcements/v4.0.9/

Fixes:
 - https://autobuild.buildroot.org/results/770/770e9106a0c92f02e0f699505e69b35ac0e6cd41/build-end.log

   /home/buildroot/instance-0/output-1/build/fluent-bit-4.0.3/plugins/out_cloudwatch_logs/cloudwatch_api.c:1540:66: error: implicit declaration of function 'strcasestr'; did you mean 'strcasecmp'? [-Wimplicit-function-declaration]

   Fix commit: https://github.com/fluent/fluent-bit/pull/10452

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 39afca752d)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
Thomas Devoogdt
2025-09-10 13:19:44 +02:00
committed by Thomas Perale
parent b2e212c91c
commit adaed18a7c
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/fluent-bit/0001-plugins-kafka-fix-cmake-cross-compile-error.patch
View File

@@ -1,4 +1,4 @@
From f32c4e909ec4a4872c2c5fc186f27d1f7e4e8c2a Mon Sep 17 00:00:00 2001
From a21de9cb95f2199270a6ac6922ffa4ca8d453f26 Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <thomas@devoogdt.com>
Date: Sat, 16 Nov 2024 19:46:28 +0100
Subject: [PATCH] plugins: kafka: fix cmake cross compile error
@@ -17,26 +17,26 @@ Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/plugins/in_kafka/CMakeLists.txt b/plugins/in_kafka/CMakeLists.txt
index ede0831f9..02e2dc786 100644
index 928266b57..dc251276e 100644
--- a/plugins/in_kafka/CMakeLists.txt
+++ b/plugins/in_kafka/CMakeLists.txt
@@ -3,5 +3,7 @@ set(src
)
FLB_PLUGIN(in_kafka "${src}" ${KAFKA_LIBRARIES})
FLB_PLUGIN(in_kafka "${src}" ${KAFKA_LIBRARIES} flb-aws)
-target_include_directories(flb-plugin-in_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka)
+if(DEFINED KAFKA_INCLUDEDIR)
+ target_include_directories(flb-plugin-in_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka)
+endif()
target_link_libraries(flb-plugin-in_kafka -lpthread)
diff --git a/plugins/out_kafka/CMakeLists.txt b/plugins/out_kafka/CMakeLists.txt
index 01c96529b..54b14fc2a 100644
index 9d8b34642..1c967329f 100644
--- a/plugins/out_kafka/CMakeLists.txt
+++ b/plugins/out_kafka/CMakeLists.txt
@@ -5,5 +5,7 @@ set(src
kafka.c)
FLB_PLUGIN(out_kafka "${src}" ${KAFKA_LIBRARIES})
FLB_PLUGIN(out_kafka "${src}" ${KAFKA_LIBRARIES} flb-aws)
-target_include_directories(flb-plugin-out_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka)
+if(DEFINED KAFKA_INCLUDEDIR)
+ target_include_directories(flb-plugin-out_kafka PUBLIC ${KAFKA_INCLUDEDIR}/librdkafka)

18
package/fluent-bit/0002-lib-librdkafka-only-require-a-C-compiler.patch
View File

@@ -1,4 +1,4 @@
From dea6fb0138d9356ebdc4983a61c185bc759d86b0 Mon Sep 17 00:00:00 2001
From c33d6bd392c5c8bbd231b2a9d00d4959cc553c44 Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <thomas.devoogdt@barco.com>
Date: Tue, 25 Jul 2023 09:10:41 +0200
Subject: [PATCH] lib: librdkafka: only require a C compiler
@@ -6,14 +6,14 @@ Subject: [PATCH] lib: librdkafka: only require a C compiler
Upstream: https://github.com/confluentinc/librdkafka/pull/4366
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
lib/librdkafka-2.8.0/CMakeLists.txt | 22 ++++++++++++--
lib/librdkafka-2.8.0/examples/CMakeLists.txt | 31 +++++++++++++-------
lib/librdkafka-2.10.1/CMakeLists.txt | 22 +++++++++++--
lib/librdkafka-2.10.1/examples/CMakeLists.txt | 31 ++++++++++++-------
2 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/lib/librdkafka-2.8.0/CMakeLists.txt b/lib/librdkafka-2.8.0/CMakeLists.txt
diff --git a/lib/librdkafka-2.10.1/CMakeLists.txt b/lib/librdkafka-2.10.1/CMakeLists.txt
index f3d05bad7..8ef47053a 100644
--- a/lib/librdkafka-2.8.0/CMakeLists.txt
+++ b/lib/librdkafka-2.8.0/CMakeLists.txt
--- a/lib/librdkafka-2.10.1/CMakeLists.txt
+++ b/lib/librdkafka-2.10.1/CMakeLists.txt
@@ -3,7 +3,16 @@ cmake_minimum_required(VERSION 3.5)
include("packaging/cmake/parseversion.cmake")
parseversion("src/rdkafka.h")
@@ -57,10 +57,10 @@ index f3d05bad7..8ef47053a 100644
if(RDKAFKA_BUILD_EXAMPLES)
add_subdirectory(examples)
diff --git a/lib/librdkafka-2.8.0/examples/CMakeLists.txt b/lib/librdkafka-2.8.0/examples/CMakeLists.txt
diff --git a/lib/librdkafka-2.10.1/examples/CMakeLists.txt b/lib/librdkafka-2.10.1/examples/CMakeLists.txt
index 91851d2cb..6874195ce 100644
--- a/lib/librdkafka-2.8.0/examples/CMakeLists.txt
+++ b/lib/librdkafka-2.8.0/examples/CMakeLists.txt
--- a/lib/librdkafka-2.10.1/examples/CMakeLists.txt
+++ b/lib/librdkafka-2.10.1/examples/CMakeLists.txt
@@ -5,8 +5,10 @@ endif(WIN32)
add_executable(producer producer.c ${win32_sources})
target_link_libraries(producer PUBLIC rdkafka)

2
package/fluent-bit/fluent-bit.hash
View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 c7d276238d25242467218941842d8cd4df6cfa52cc9379ae5755220cdefd1dc1 fluent-bit-4.0.3.tar.gz
sha256 0031f74b616b4669064a59902559da2f87174aa8007e749b5df19ed79c534f5b fluent-bit-4.0.9.tar.gz
sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE

2
package/fluent-bit/fluent-bit.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
FLUENT_BIT_VERSION = 4.0.3
FLUENT_BIT_VERSION = 4.0.9
FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION))
FLUENT_BIT_LICENSE = Apache-2.0
FLUENT_BIT_LICENSE_FILES = LICENSE