summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/fluentbit
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/fluentbit')
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch70
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch34
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch95
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch28
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch4
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch40
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch36
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch32
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch34
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch45
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch63
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch (renamed from meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch)11
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch31
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch33
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch36
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch46
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb92
-rw-r--r--meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb151
18 files changed, 318 insertions, 563 deletions
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
deleted file mode 100644
index f5a1716c07..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 6a704ab7bf69cd5d6970b3a7d3ae7798b26027c1 Mon Sep 17 00:00:00 2001
2From: Paulo Neves <ptsneves@gmail.com>
3Date: Thu, 28 Jul 2022 11:28:41 +0200
4Subject: [PATCH] CMakeLists.txt Do not use private makefile $< target
5
6$< is a private detail from the Makefile generated by CMakefile and
7are not under control or to be used at the CMakeLists level. In 3.20
8that private generation changed pre-requisite targets[1] and now logs
9contain the path compiler_depend.ts instead of the actual file.
10
11Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492]
12---
13 CMakeLists.txt | 6 +-----
14 lib/chunkio/CMakeLists.txt | 7 +------
15 lib/cmetrics/CMakeLists.txt | 7 +------
16 3 files changed, 3 insertions(+), 17 deletions(-)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index 3dba5a8..d94b988 100644
20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt
22@@ -46,11 +46,7 @@ else()
23 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
24 endif()
25
26-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
27- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
28-else()
29- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
30-endif()
31+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
32
33 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
34 set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
35diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt
36index bbe1f39..809ea93 100644
37--- a/lib/chunkio/CMakeLists.txt
38+++ b/lib/chunkio/CMakeLists.txt
39@@ -14,12 +14,7 @@ else()
40 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ")
41 endif()
42
43-# Set __FILENAME__
44-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
45- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
46-else()
47- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
48-endif()
49+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
50
51 include(cmake/macros.cmake)
52
53diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
54index 60e8774..e3d6149 100644
55--- a/lib/cmetrics/CMakeLists.txt
56+++ b/lib/cmetrics/CMakeLists.txt
57@@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3)
58 set(CMT_VERSION_PATCH 5)
59 set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
60
61-# Define __FILENAME__ consistently across Operating Systems
62-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
63- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
64-else()
65- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
66-endif()
67+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
68
69 # Configuration options
70 option(CMT_DEV "Enable development mode" No)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
deleted file mode 100644
index 8d89e4df35..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From f645128082117a0152a95b3dccd869a184b7513f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 01:23:48 -0700
4Subject: [PATCH 1/2] Use posix strerror_r with musl
5
6Default with glibc is GNU extention of strerror_r
7where as musl uses posix variant, call that out
8
9Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/flb_network.c | 5 +++++
13 1 file changed, 5 insertions(+)
14
15diff --git a/src/flb_network.c b/src/flb_network.c
16index 992eb1d..5d7a337 100644
17--- a/src/flb_network.c
18+++ b/src/flb_network.c
19@@ -506,7 +506,12 @@ static int net_connect_async(int fd,
20 }
21
22 /* Connection is broken, not much to do here */
23+#ifdef __GLIBC__
24 str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
25+#else
26+ strerror_r(error, so_error_buf, sizeof(so_error_buf));
27+ str = so_error_buf;
28+#endif
29 flb_error("[net] TCP connection failed: %s:%i (%s)",
30 u->tcp_host, u->tcp_port, str);
31 return -1;
32--
332.37.1
34
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
new file mode 100644
index 0000000000..32f4fdec51
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
@@ -0,0 +1,95 @@
1From 7e6295f14ea057562a235fbf6762d867e739a181 Mon Sep 17 00:00:00 2001
2From: Niko Mauno <niko.mauno@vaisala.com>
3Date: Sun, 29 Sep 2024 12:00:00 +0000
4Subject: [PATCH] lib: Do not use private makefile targets in CMakelists.txt
5
6By extending the scope of changes introduced in commit
7fc325524d50fe179b76f127243ab9e03ddbdaaa4
8("build: CMakeLists.txt Do not use private makefile targets (#5819)")
9we mitigate the following error produced by BitBake in Yocto
10
11 ERROR: fluentbit-3.1.9-r0 do_package_qa: QA Issue: File /usr/bin/fluent-bit in package fluentbit contains reference to TMPDIR [buildpaths]
12 ERROR: fluentbit-3.1.9-r0 do_package_qa: Fatal QA errors were found, failing task.
13
14stemming from
15
16 $ strings packages-split/fluentbit/usr/bin/fluent-bit
17 ...
18 $(subst /yocto/upstream/build/tmp/work/cortexa57-poky-linux/fluentbit/3.1.9/git/,,$(abspath $<))
19 ...
20
21Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
22
23Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450]
24---
25 lib/cfl/CMakeLists.txt | 8 ++------
26 lib/cmetrics/CMakeLists.txt | 8 ++------
27 lib/ctraces/CMakeLists.txt | 8 ++------
28 lib/monkey/CMakeLists.txt | 4 +---
29 4 files changed, 7 insertions(+), 21 deletions(-)
30
31--- a/lib/cfl/CMakeLists.txt
32+++ b/lib/cfl/CMakeLists.txt
33@@ -40,12 +40,8 @@ if(NOT MSVC)
34 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
35 endif()
36
37-# Define __FILENAME__ consistently across Operating Systems
38-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
39- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
40-else()
41- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
42-endif()
43+# Define __FILENAME__
44+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
45
46
47
48--- a/lib/cmetrics/CMakeLists.txt
49+++ b/lib/cmetrics/CMakeLists.txt
50@@ -60,12 +60,8 @@ if(NOT MSVC)
51 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
52 endif()
53
54-# Define __CMT_FILENAME__ consistently across Operating Systems
55-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
56- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
57-else()
58- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
59-endif()
60+# Define __CMT_FILENAME__
61+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
62
63 # Configuration options
64 option(CMT_DEV "Enable development mode" No)
65--- a/lib/ctraces/CMakeLists.txt
66+++ b/lib/ctraces/CMakeLists.txt
67@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 6)
68 set(CTR_VERSION_PATCH 4)
69 set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")
70
71-# Define __FILENAME__ consistently across Operating Systems
72-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
73- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
74-else()
75- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
76-endif()
77+# Define __FILENAME__
78+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
79
80 # Configuration options
81 option(CTR_DEV "Enable development mode" No)
82--- a/lib/monkey/CMakeLists.txt
83+++ b/lib/monkey/CMakeLists.txt
84@@ -15,10 +15,8 @@ include(GNUInstallDirs)
85 # Set default compiler options
86 if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
87 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
88-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath \$$<))\"'")
89-else()
90-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
91 endif()
92+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
93
94 # Monkey Version
95 set(MK_VERSION_MAJOR 1)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
deleted file mode 100644
index e70664031b..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 0d22024c5defba7007e3e633753790e20209c6f6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 Aug 2022 09:59:41 -0700
4Subject: [PATCH 1/5] monkey: Define _GNU_SOURCE for memmem API check
5
6This define is necessary to get this API on glibc based systems
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 lib/monkey/mk_core/CMakeLists.txt | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/lib/monkey/mk_core/CMakeLists.txt b/lib/monkey/mk_core/CMakeLists.txt
15index 0e74f8d..739fff3 100644
16--- a/lib/monkey/mk_core/CMakeLists.txt
17+++ b/lib/monkey/mk_core/CMakeLists.txt
18@@ -62,6 +62,7 @@ set(src "${src}"
19 )
20
21 check_c_source_compiles("
22+ #define _GNU_SOURCE
23 #include <string.h>
24 int main() {
25 char haystack[] = \"1234\";
26--
272.37.1
28
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
index 425b838b78..025f8729ea 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
@@ -1,4 +1,4 @@
1From 71dab751a27a2e582b711de22873065dd28f4b65 Mon Sep 17 00:00:00 2001 1From c8c9dd3aeb49ab2ec94c3ab081e2368736a5da20 Mon Sep 17 00:00:00 2001
2From: Paulo Neves <ptsneves@gmail.com> 2From: Paulo Neves <ptsneves@gmail.com>
3Date: Thu, 28 Jul 2022 11:42:31 +0200 3Date: Thu, 28 Jul 2022 11:42:31 +0200
4Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories 4Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories
@@ -13,8 +13,6 @@ Upstream-Status: Pending
13 include/fluent-bit/flb_info.h.in | 2 +- 13 include/fluent-bit/flb_info.h.in | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/include/fluent-bit/flb_info.h.in b/include/fluent-bit/flb_info.h.in
17index a89485c..2579afc 100644
18--- a/include/fluent-bit/flb_info.h.in 16--- a/include/fluent-bit/flb_info.h.in
19+++ b/include/fluent-bit/flb_info.h.in 17+++ b/include/fluent-bit/flb_info.h.in
20@@ -23,7 +23,7 @@ 18@@ -23,7 +23,7 @@
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
deleted file mode 100644
index d911420df2..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From c7b969d1a2a6b61bd179214ee2516b7b6cd55b27 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 Aug 2022 11:21:57 -0700
4Subject: [PATCH 2/5] mbedtls: Remove unused variable
5
6Fixes
7library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 lib/mbedtls-2.28.0/library/bignum.c | 4 +---
14 1 file changed, 1 insertion(+), 3 deletions(-)
15
16diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c
17index 62e7f76..9c256ae 100644
18--- a/lib/mbedtls-2.28.0/library/bignum.c
19+++ b/lib/mbedtls-2.28.0/library/bignum.c
20@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
21 mbedtls_mpi_uint *d,
22 mbedtls_mpi_uint b )
23 {
24- mbedtls_mpi_uint c = 0, t = 0;
25+ mbedtls_mpi_uint c = 0;
26
27 #if defined(MULADDC_HUIT)
28 for( ; i >= 8; i -= 8 )
29@@ -1443,8 +1443,6 @@ void mpi_mul_hlp( size_t i,
30 }
31 #endif /* MULADDC_HUIT */
32
33- t++;
34-
35 while( c != 0 )
36 {
37 *d += c; c = ( *d < c ); d++;
38--
392.37.1
40
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
new file mode 100644
index 0000000000..909d1be28d
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
@@ -0,0 +1,36 @@
1From bf4e832544e8aa5866ef57859f95b71bd8811154 Mon Sep 17 00:00:00 2001
2From: Niko Mauno <niko.mauno@vaisala.com>
3Date: Mon, 21 Oct 2024 16:02:46 +0000
4Subject: [PATCH] CMakeLists.txt: Revise init manager deduction
5
6The init manager deduction is not cross-compile friendly, so replace
7the host specific condition checks with placeholders that can be
8replaced in Yocto recipe.
9
10Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
11
12Upstream-Status: Inappropriate [configuration]
13---
14 src/CMakeLists.txt | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17--- a/src/CMakeLists.txt
18+++ b/src/CMakeLists.txt
19@@ -569,7 +569,7 @@ if(FLB_BINARY)
20 set(SYSTEMD_UNITDIR /lib/systemd/system)
21 endif()
22
23- if(SYSTEMD_UNITDIR)
24+ if(@INIT_MANAGER_IS_SYSTEMD@)
25 if (FLB_AMAZON_LINUX2)
26 set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
27 configure_file(
28@@ -594,7 +594,7 @@ if(FLB_BINARY)
29 install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
30 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
31 endif()
32- elseif(IS_DIRECTORY /usr/share/upstart)
33+ elseif(@INIT_MANAGER_IS_UPSTART@)
34 set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
35 configure_file(
36 "${PROJECT_SOURCE_DIR}/init/upstart.in"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
deleted file mode 100644
index 473ebaf7d4..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 2d12629f768d2459b1fc8a8ca0c38024d84bc195 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 Aug 2022 11:32:12 -0700
4Subject: [PATCH 3/5] mbedtls: Disable documentation warning as error with
5 clang
6
7There are shortcomings with doxygen info which clang-15+ flags, dont
8treat them as errors
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 lib/mbedtls-2.28.0/CMakeLists.txt | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/lib/mbedtls-2.28.0/CMakeLists.txt b/lib/mbedtls-2.28.0/CMakeLists.txt
18index b33c088..c5f886f 100644
19--- a/lib/mbedtls-2.28.0/CMakeLists.txt
20+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
21@@ -212,7 +212,7 @@ if(CMAKE_COMPILER_IS_GNU)
22 endif(CMAKE_COMPILER_IS_GNU)
23
24 if(CMAKE_COMPILER_IS_CLANG)
25- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
26+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wno-error=documentation")
27 set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
28 set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
29 set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
30--
312.37.1
32
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
deleted file mode 100644
index 158857ae20..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 8486b912281ae85db0c9fc05bb546f16872e114c Mon Sep 17 00:00:00 2001
2From: Paulo Neves <ptsneves@gmail.com>
3Date: Thu, 28 Jul 2022 14:37:18 +0200
4Subject: [PATCH] mbedtls: Do not overwrite CFLAGS
5
6bitbake passes CFLAGS that are often in conflict with the ones set
7in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
8FORTIFY_SOURCE=2 except in release mode
9
10Upstream-Status: Inappropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
11---
12 lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
13 1 file changed, 2 deletions(-)
14
15--- a/lib/mbedtls-2.28.0/CMakeLists.txt
16+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
17@@ -204,8 +204,6 @@ if(CMAKE_COMPILER_IS_GNU)
18 if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
19 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
20 endif()
21- set(CMAKE_C_FLAGS_RELEASE "-O2")
22- set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
23 set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
24 set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
25 set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
26@@ -215,8 +213,6 @@ endif(CMAKE_COMPILER_IS_GNU)
27
28 if(CMAKE_COMPILER_IS_CLANG)
29 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
30- set(CMAKE_C_FLAGS_RELEASE "-O2")
31- set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
32 set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
33 set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
34 set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
deleted file mode 100644
index bd4276193d..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From a797b79483940ed4adcaa5fe2c40dd0487c7c2c7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 Aug 2022 11:39:08 -0700
4Subject: [PATCH 4/5] Use correct type to store return from flb_kv_item_create
5
6Fix
7error: incompatible pointer to integer conversion assigning to 'int' from 'struct flb_kv *'
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 plugins/out_stackdriver/stackdriver_conf.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/plugins/out_stackdriver/stackdriver_conf.c b/plugins/out_stackdriver/stackdriver_conf.c
17index a9a8eb0..e4f969e 100644
18--- a/plugins/out_stackdriver/stackdriver_conf.c
19+++ b/plugins/out_stackdriver/stackdriver_conf.c
20@@ -176,12 +176,12 @@ static int read_credentials_file(const char *cred_file, struct flb_stackdriver *
21
22 static int parse_configuration_labels(struct flb_stackdriver *ctx)
23 {
24- int ret;
25 char *p;
26 flb_sds_t key;
27 flb_sds_t val;
28 struct mk_list *head;
29 struct flb_slist_entry *entry;
30+ struct flb_kv *ret;
31 msgpack_object_kv *kv = NULL;
32
33 if (ctx->labels) {
34@@ -216,7 +216,7 @@ static int parse_configuration_labels(struct flb_stackdriver *ctx)
35 flb_sds_destroy(key);
36 flb_sds_destroy(val);
37
38- if (ret == -1) {
39+ if (!ret) {
40 return -1;
41 }
42 }
43--
442.37.1
45
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
deleted file mode 100644
index f6e3dce2f3..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 7a792624925d46690c1f07fe4b194b5f4c510db6 Mon Sep 17 00:00:00 2001
2From: Paulo Neves <ptsneves@gmail.com>
3Date: Tue, 2 Aug 2022 09:57:05 +0200
4Subject: [PATCH 1/1] build: Make systemd init systemd detection contingent on
5 pkgconfig
6
7Use pkg-config to get systemd.pc variables and systemdunitdir. Those
8variable ensure that .service files are installed in the correct paths
9and only when systemd is detected.
10
11Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/5818]
12
13---
14 cmake/FindJournald.cmake | 4 ++++
15 src/CMakeLists.txt | 4 ++--
16 2 files changed, 6 insertions(+), 2 deletions(-)
17
18diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
19index f5a3a832b..9e6657a29 100644
20--- a/cmake/FindJournald.cmake
21+++ b/cmake/FindJournald.cmake
22@@ -5,6 +5,8 @@
23 # JOURNALD_INCLUDE_DIR - the Journald include directory
24 # JOURNALD_LIBRARIES - Link these to use Journald
25 # JOURNALD_DEFINITIONS - Compiler switches required for using Journald
26+# SYSTEMD_UNITDIR - The systemd units' directory
27+#
28 # Redistribution and use is allowed according to the terms of the BSD license.
29 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
30 #
31@@ -16,7 +18,9 @@
32 # in the FIND_PATH() and FIND_LIBRARY() calls
33 find_package(PkgConfig)
34 pkg_check_modules(PC_JOURNALD QUIET systemd)
35+pkg_get_variable(PC_SYSTEMD_UNITDIR systemd "systemdsystemunitdir")
36
37+set(SYSTEMD_UNITDIR ${PC_SYSTEMD_UNITDIR})
38 set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
39 set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
40
41diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
42index 522bbf9bd..30743d8d6 100644
43--- a/src/CMakeLists.txt
44+++ b/src/CMakeLists.txt
45@@ -480,13 +480,13 @@ if(FLB_BINARY)
46 endif()
47
48 # Detect init system, install upstart, systemd or init.d script
49- if(IS_DIRECTORY /lib/systemd/system)
50+ if(DEFINED SYSTEMD_UNITDIR)
51 set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
52 configure_file(
53 "${PROJECT_SOURCE_DIR}/init/systemd.in"
54 ${FLB_SYSTEMD_SCRIPT}
55 )
56- install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
57+ install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
58 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
59 elseif(IS_DIRECTORY /usr/share/upstart)
60 set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
61--
622.25.1
63
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
index bdcc534964..c34a0ba71d 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
@@ -1,7 +1,7 @@
1From 63dbbad5978e5f5b0e7d42614999cb6b4ebcce10 Mon Sep 17 00:00:00 2001 1From a07df56092e529627db0946c025cb4964567280c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 01:27:16 -0700 3Date: Wed, 10 Aug 2022 01:27:16 -0700
4Subject: [PATCH 2/2] chunkio: Link with fts library with musl 4Subject: [PATCH] chunkio: Link with fts library with musl
5 5
6Fixes 6Fixes
7cio_utils.c:(.text+0x64): undefined reference to `fts_read' 7cio_utils.c:(.text+0x64): undefined reference to `fts_read'
@@ -14,10 +14,10 @@ Upstream-Status: Pending
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/lib/chunkio/src/CMakeLists.txt b/lib/chunkio/src/CMakeLists.txt 16diff --git a/lib/chunkio/src/CMakeLists.txt b/lib/chunkio/src/CMakeLists.txt
17index a4fc2d3..4244eb8 100644 17index bb52273d4..524500919 100644
18--- a/lib/chunkio/src/CMakeLists.txt 18--- a/lib/chunkio/src/CMakeLists.txt
19+++ b/lib/chunkio/src/CMakeLists.txt 19+++ b/lib/chunkio/src/CMakeLists.txt
20@@ -13,6 +13,7 @@ set(src 20@@ -14,6 +14,7 @@ set(src
21 ) 21 )
22 22
23 set(libs cio-crc32) 23 set(libs cio-crc32)
@@ -25,6 +25,3 @@ index a4fc2d3..4244eb8 100644
25 25
26 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") 26 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
27 set(src 27 set(src
28--
292.37.1
30
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
new file mode 100644
index 0000000000..281bf66fb9
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
@@ -0,0 +1,31 @@
1From 0c4310483875509f464883fa345f54e0d3ae25a5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 01:23:48 -0700
4Subject: [PATCH] Use posix strerror_r with musl
5
6Default with glibc is GNU extention of strerror_r
7where as musl uses posix variant, call that out
8
9Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12Resolved conflicts while upgrading recipe from v1.9.9 to v3.1.9.
13
14Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
15---
16 src/flb_network.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/flb_network.c b/src/flb_network.c
20index 8f8ca33f6..dd098a2ea 100644
21--- a/src/flb_network.c
22+++ b/src/flb_network.c
23@@ -605,7 +605,7 @@ static int net_connect_async(int fd,
24 /* Connection is broken, not much to do here */
25 #if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \
26 (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE - 0L >= 600L)) && \
27- (!defined(_GNU_SOURCE))
28+ (!defined(_GNU_SOURCE)) || (!defined(__GLIBC__))
29 ret = strerror_r(error, so_error_buf, sizeof(so_error_buf));
30 if (ret == 0) {
31 str = so_error_buf;
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
deleted file mode 100644
index f023ab5732..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 27f0bd5a3339612e03112e6b490900a9fabc3337 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 Aug 2022 11:44:25 -0700
4Subject: [PATCH 5/5] stackdriver: Fix return type mismatch
5
6Fix
7error: incompatible integer to pointer conversion returning 'int' from a function with result type 'flb_sds_t' (aka 'char *') [-Wint-conversion]
8 return -1;
9 ^~
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 plugins/out_stackdriver/stackdriver.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/plugins/out_stackdriver/stackdriver.c b/plugins/out_stackdriver/stackdriver.c
19index ae66bf2..e01755c 100644
20--- a/plugins/out_stackdriver/stackdriver.c
21+++ b/plugins/out_stackdriver/stackdriver.c
22@@ -2033,7 +2033,7 @@ static flb_sds_t stackdriver_format(struct flb_stackdriver *ctx,
23 flb_sds_destroy(operation_producer);
24 msgpack_unpacked_destroy(&result);
25 msgpack_sbuffer_destroy(&mp_sbuf);
26- return -1;
27+ return NULL;
28 }
29
30 /* Number of parsed labels */
31--
322.37.1
33
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
deleted file mode 100644
index c3f2574d26..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From f88d9b82e8bd8ae38fba666b5825ffb41769f81a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 Aug 2022 12:25:22 -0700
4Subject: [PATCH] monkey: Fix TLS detection testcase
5
6Clang15 errors out on compiling the check and disables TLS
7
8Fixes errors like
9
10error: call to undeclared function '__tls_get_addr'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
11 __tls_get_addr(0);
12 ^
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16Upstream-Status: Pending
17
18 lib/monkey/CMakeLists.txt | 2 ++
19 1 file changed, 2 insertions(+)
20
21diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
22index 15e62e8..96ac2bd 100644
23--- a/lib/monkey/CMakeLists.txt
24+++ b/lib/monkey/CMakeLists.txt
25@@ -178,6 +178,8 @@ endif()
26 # Use old Pthread TLS
27 if(NOT MK_PTHREAD_TLS)
28 check_c_source_compiles("
29+ #include <sys/types.h>
30+ extern void *__tls_get_addr(size_t *v);
31 __thread int a;
32 int main() {
33 __tls_get_addr(0);
34--
352.37.1
36
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
deleted file mode 100644
index 71bdd34eeb..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From c41653e856d05ed430d22f8b311714ff756a0e0b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Mar 2023 18:05:27 -0700
4Subject: [PATCH] cmake: Do not check for upstart on build host
5
6Some ubuntu distros might have this directory /usr/share/upstart around
7and yocto based distros not using systemd will process this piece of
8code and falsely assume that target supports upstart, which may not be
9true in case of cross-compilation.
10
11This also can end up in configure errors e.g.
12
13| CMake Error at src/CMakeLists.txt:496 (install):
14| install DIRECTORY given unknown argument "/etc/td-agent-bit/".
15|
16|
17| -- Configuring incomplete, errors occurred!
18
19Upstream-Status: Inappropriate [ Cross-compile Specific ]
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21---
22 src/CMakeLists.txt | 8 --------
23 1 file changed, 8 deletions(-)
24
25diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
26index bb30b2a..c63b6d8 100644
27--- a/src/CMakeLists.txt
28+++ b/src/CMakeLists.txt
29@@ -486,14 +486,6 @@ if(FLB_BINARY)
30 )
31 install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
32 install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
33- elseif(IS_DIRECTORY /usr/share/upstart)
34- set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
35- configure_file(
36- "${PROJECT_SOURCE_DIR}/init/upstart.in"
37- ${FLB_UPSTART_SCRIPT}
38- )
39- install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
40- install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
41 else()
42 # FIXME: should we support Sysv init script ?
43 endif()
44--
452.40.0
46
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
deleted file mode 100644
index fc06095475..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
+++ /dev/null
@@ -1,92 +0,0 @@
1SUMMARY = "Fast Log processor and Forwarder"
2DESCRIPTION = "Fluent Bit is a data collector, processor and \
3forwarder for Linux. It supports several input sources and \
4backends (destinations) for your data. \
5"
6
7HOMEPAGE = "http://fluentbit.io"
8BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
9
10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
12SECTION = "net"
13
14SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV};downloadfilename=${BPN}-${PV}.tar.gz \
15 file://0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch \
16 file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
17 file://0003-mbedtls-Do-not-overwrite-CFLAGS.patch \
18 file://0004-build-Make-systemd-init-systemd-detection-contingent.patch \
19 file://0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch \
20 file://0002-mbedtls-Remove-unused-variable.patch \
21 file://0003-mbedtls-Disable-documentation-warning-as-error-with-.patch \
22 file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
23 file://0005-stackdriver-Fix-return-type-mismatch.patch \
24 file://0006-monkey-Fix-TLS-detection-testcase.patch \
25 file://0007-cmake-Do-not-check-for-upstart-on-build-host.patch \
26 "
27SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch"
28SRC_URI:append:libc-musl = "\
29 file://0001-Use-posix-strerror_r-with-musl.patch \
30 file://0002-chunkio-Link-with-fts-library-with-musl.patch \
31 "
32SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540"
33S = "${WORKDIR}/fluent-bit-${PV}"
34
35DEPENDS = "zlib bison-native flex-native openssl"
36DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
37
38PACKAGECONFIG[yaml] = "-DFLB_CONFIG_YAML=On,-DFLB_CONFIG_YAML=Off,libyaml"
39PACKAGECONFIG[kafka] = "-DFLB_OUT_KAFKA=On,-DFLB_OUT_KAFKA=Off,librdkafka"
40PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=On,-DFLB_EXAMPLES=Off"
41PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=On,-DFLB_JEMALLOC=Off,jemalloc"
42#TODO add more fluentbit options to PACKAGECONFIG[]
43
44DEPENDS:append:libc-musl = " fts "
45
46# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
47do_compile:append() {
48 find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
49}
50
51PACKAGECONFIG ?= "yaml"
52
53LTO = ""
54
55# Use CMake 'Unix Makefiles' generator
56OECMAKE_GENERATOR ?= "Unix Makefiles"
57
58# Fluent Bit build options
59# ========================
60
61# Host related setup
62EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_TD=1"
63
64# Disable LuaJIT and filter_lua support
65EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "
66
67# Disable Library and examples
68EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off"
69
70# Enable systemd iff systemd is in DISTRO_FEATURES
71EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','-DFLB_SYSTEMD=Off',d)}"
72
73# Enable release builds
74EXTRA_OECMAKE += "-DFLB_RELEASE=On"
75
76# musl needs these options
77EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefix=je_ --with-lg-quantum=3" -DFLB_CORO_STACK_SIZE=24576'
78
79EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
80EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
81EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
82EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
83EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
84
85CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2"
86
87inherit cmake systemd pkgconfig
88
89SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"
90
91EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
92TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
new file mode 100644
index 0000000000..05e4fd937f
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
@@ -0,0 +1,151 @@
1SUMMARY = "Fast Log Processor and Forwarder"
2DESCRIPTION = "Fluent Bit allows to collect log events or metrics from \
3different sources, process them and deliver them to different backends \
4such as Fluentd, Elasticsearch, Splunk, DataDog, Kafka, New Relic, Azure \
5services, AWS services, Google services, NATS, InfluxDB or any custom \
6HTTP end-point."
7HOMEPAGE = "http://fluentbit.io"
8BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
9SECTION = "net"
10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
12DEPENDS = "\
13 bison-native \
14 flex-native \
15 openssl \
16 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
17"
18DEPENDS:append:libc-musl = " fts"
19
20SRCREV = "b12e507090273576d1156342780c7c6d358fa579"
21SRC_URI = "\
22 git://github.com/fluent/fluent-bit.git;branch=master;protocol=https \
23 file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \
24 file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
25 file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \
26"
27SRC_URI:append:libc-musl = "\
28 file://0004-chunkio-Link-with-fts-library-with-musl.patch \
29 file://0005-Use-posix-strerror_r-with-musl.patch \
30"
31
32# prefix tag with "v" to avoid upgrade to random tags like "20220215"
33UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
34
35
36PACKAGECONFIG ??= "\
37 aws \
38 binary \
39 config-yaml \
40 custom-calyptia \
41 http-server \
42 inotify \
43 ipo \
44 metrics \
45 parser \
46 prefer-system-libs \
47 profiles \
48 proxy-go \
49 record-accessor \
50 regex \
51 signv4 \
52 sqldb \
53 stream-processor \
54 tls \
55 utf8-encoder \
56"
57# See https://github.com/fluent/fluent-bit/issues/7248#issuecomment-1631280496
58PACKAGECONFIG:remove:toolchain-clang = "ipo"
59
60# Use system libs
61PACKAGECONFIG[prefer-system-libs] = "-DFLB_PREFER_SYSTEM_LIBS=Yes,-DFLB_PREFER_SYSTEM_LIBS=No, nghttp2 c-ares"
62DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs backtrace', 'libbacktrace', '', d)}"
63DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs jemalloc', 'jemalloc', '', d)}"
64DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs luajit', 'luajit', '', d)}"
65
66PACKAGECONFIG[all] = "-DFLB_ALL=Yes,-DFLB_ALL=No"
67PACKAGECONFIG[arrow] = "-DFLB_ARROW=Yes,-DFLB_ARROW=No"
68PACKAGECONFIG[avro-encoder] = "-DFLB_AVRO_ENCODER=Yes,-DFLB_AVRO_ENCODER=No"
69PACKAGECONFIG[aws-error-reporter] = "-DFLB_AWS_ERROR_REPORTER=Yes,-DFLB_AWS_ERROR_REPORTER=No"
70PACKAGECONFIG[aws] = "-DFLB_AWS=Yes,-DFLB_AWS=No"
71PACKAGECONFIG[backtrace] = "-DFLB_BACKTRACE=Yes,-DFLB_BACKTRACE=No"
72PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No"
73PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No"
74PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml"
75PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No"
76PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No"
77PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No"
78PACKAGECONFIG[http-client-debug] = "-DFLB_HTTP_CLIENT_DEBUG=Yes,-DFLB_HTTP_CLIENT_DEBUG=No"
79PACKAGECONFIG[http-server] = "-DFLB_HTTP_SERVER=Yes,-DFLB_HTTP_SERVER=No"
80PACKAGECONFIG[inotify] = "-DFLB_INOTIFY=Yes,-DFLB_INOTIFY=No"
81PACKAGECONFIG[ipo] = "-DFLB_IPO=Yes,-DFLB_IPO=no"
82PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=Yes,-DFLB_JEMALLOC=No,jemalloc"
83PACKAGECONFIG[luajit] = "-DFLB_LUAJIT=Yes,-DFLB_LUAJIT=No"
84PACKAGECONFIG[metrics] = "-DFLB_METRICS=Yes,-DFLB_METRICS=No"
85PACKAGECONFIG[mtrace] = "-DFLB_MTRACE=Yes,-DFLB_MTRACE=No"
86PACKAGECONFIG[parser] = "-DFLB_PARSER=Yes,-DFLB_PARSER=No"
87PACKAGECONFIG[posix-tls] = "-DFLB_POSIX_TLS=Yes,-DFLB_POSIX_TLS=No"
88PACKAGECONFIG[profiles] = "-DFLB_PROFILES=Yes,-DFLB_PROFILES=No"
89PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No"
90PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No"
91PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No"
92PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No"
93PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No"
94PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No"
95PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No"
96PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No"
97PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No"
98PACKAGECONFIG[tls] = "-DFLB_TLS=Yes,-DFLB_TLS=No"
99PACKAGECONFIG[trace] = "-DFLB_TRACE=Yes,-DFLB_TRACE=No"
100PACKAGECONFIG[utf8-encoder] = "-DFLB_UTF8_ENCODER=Yes,-DFLB_UTF8_ENCODER=No"
101PACKAGECONFIG[valgrind] = "-DFLB_VALGRIND=Yes,-DFLB_VALGRIND=No,valgrind"
102PACKAGECONFIG[wamrc] = "-DFLB_WAMRC=Yes,-DFLB_WAMRC=No"
103PACKAGECONFIG[wasm-stack-protect] = "-DFLB_WASM_STACK_PROTECT=Yes,-DFLB_WASM_STACK_PROTECT=No"
104PACKAGECONFIG[wasm] = "-DFLB_WASM=Yes,-DFLB_WASM=No"
105PACKAGECONFIG[windows-defaults] = "-DFLB_WINDOWS_DEFAULTS=Yes,-DFLB_WINDOWS_DEFAULTS=No"
106
107# Option to disable all Fluent Bit plugins by default. See cmake/plugins_options.cmake which
108# individual plugins then to enable (e.g. using EXTRA_OECMAKE:append = " -DFLB_FOOBAR=ON")
109PACKAGECONFIG[minimal] = "-DFLB_MINIMAL=Yes,-DFLB_MINIMAL=No"
110
111PACKAGECONFIG[in-kafka] = "-DFLB_KAFKA=ON -DFLB_IN_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_IN_KAFKA=OFF,librdkafka curl"
112PACKAGECONFIG[out-kafka] = "-DFLB_KAFKA=ON -DFLB_OUT_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_OUT_KAFKA=OFF,librdkafka curl"
113
114SYSTEMD_SERVICE:${PN} = "fluent-bit.service"
115
116inherit cmake systemd pkgconfig
117
118# disable manipulation of compiler flags and CMAKE_BUILD_TYPE
119# release and coverage are off by default, disable also debug
120EXTRA_OECMAKE += "-DFLB_DEBUG=No"
121
122FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}"
123TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}"
124TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2"
125EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
126
127SECURITY_STRINGFORMAT:remove = "${@bb.utils.contains('PACKAGECONFIG', 'aws-error-reporter', '-Werror=format-security', '', d)}"
128
129# GCC-15 uses C23 std and it does not yet compile with C23
130CFLAGS += "-std=gnu17"
131# 64bit atomics builtins do not exist in compiler on these arches
132LDFLAGS:append:mips = " -latomic"
133LDFLAGS:append:powerpc = " -latomic"
134LDFLAGS:append:riscv32 = " -latomic"
135LDFLAGS:append:riscv64 = " -latomic"
136LDFLAGS:append:x86 = " -latomic"
137
138do_configure:prepend() {
139 sed -i \
140 -e 's#@INIT_MANAGER_IS_SYSTEMD@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'systemd' else 'FALSE'}'#' \
141 -e 's#@INIT_MANAGER_IS_UPSTART@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'upstart' else 'FALSE'}'#' \
142 ${S}/src/CMakeLists.txt
143}
144
145# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
146do_compile:append() {
147 find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
148}
149
150# needed for shared-lib package config
151FILES:${PN} += "${libdir}/fluent-bit"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 21:17:34 +0000