mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-09-26 12:20:25 +00:00
fluentbit: Upgrade 5.0.9 -> 5.1.2
Upgrade to release 5.1.2: - workflows: bump docker/setup-buildx-action from 4.2.0 to 4.3.0 - workflows: bump reviewdog/action-actionlint from 1.73.1 to 1.73.2 - workflows: bump github/codeql-action/upload-sarif from 4.37.6 to 4.37.7 - workflows: bump uraimo/run-on-arch-action from 3.1.0 to 3.2.0 - workflows: bump github/codeql-action/upload-sarif from 4.37.7 to 4.37.8 - in_node_exporter_metrics: Implement stat and thermal_zone for macOS - out_prometheus_remote_write: Add 1-hour cut-off for expiring staled metrics - out_splunk: add time_key support for the HEC event time - Dockerfile: optimize layers - config: fix startup abort when log_level set via env and config - tests: runtime: Plug a SEGV occurrence on macOS - out_gcs: add unify_tag option to buffer all tags into one file - log: clamp the suppression length to what was written - out_gcs: implement parquet compressions - out_gcs: support application default credentials - in_winevtlog: Plug a crash path - in_winevtlog: fix crash when all channels are missing and ignore_missing_channels is enabled - log: make consistency for suppress log feature - es: opensearch: output: task: handle partial succeeded requests - tests: runtime: Fix errors of incompatible types for in_ebpf tests - filter_kubernetes: implement namespace exclude - in_systemd: support capturing with namespace - release: update to 5.1.2 - workflows: bump softprops/action-gh-release from 3.0.2 to 3.0.3 - workflows: bump github/codeql-action/upload-sarif from 4.37.8 to 4.37.9 - lib: cmetrics: update to v2.2.2 - input_chunk: input_log: in_storage_backlog: address underflowing / overflowing chunk limit size - out_azure_blob: Plug dangling pointers on exceptions - out_azure_kusto: stop logging federated and access tokens - out_gcs: add Workload Identity Federation support - wamrc: Build with LLVM-17 - reload: preserve configuration path during hot reload - out_s3: Clean up orphaned chunks - config: config_format: address wrongly specified parameter on service section - aws: compression: validate valid columnar formats - multiline: add built-in json parser for JSON multiline objects - engine: Plug a race on starting engine - tests: integration: Adjust allocation patterns for Ubuntu 26.04 - workflows: bump helm/kind-action from 1.14.0 to 1.15.0 - workflows: bump reviewdog/action-actionlint from 1.73.2 to 1.73.3 - workflows: bump docker/setup-qemu-action from 4.2.0 to 4.3.0 - out_opentelemetry: support metrics max datapoints - AGENTS: Reflect circumstance of the current commit linter - in_node_exporter_metrics: expire metrics for networking - in_forward: ingest all metrics contexts in payload - out_kafka: preserve infinite shutdown grace - out_loki: scope remove_mpa thread-local cache per instance - log: return NULL after flb_worker_context_create failure in flb_log_create - in_node_exporter_metrics: plug possible overrun indexes - packaging: stabilize Debian release images Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Leon Anavi
+13
-45
@@ -1,4 +1,4 @@
|
||||
From 8d93bb7c866f88dd7f2cac81d2acfcffae9d555d Mon Sep 17 00:00:00 2001
|
||||
From 28d49e6aef1598e8391730407280cf83fd3bb667 Mon Sep 17 00:00:00 2001
|
||||
From: Niko Mauno <niko.mauno@vaisala.com>
|
||||
Date: Sun, 29 Sep 2024 12:00:00 +0000
|
||||
Subject: [PATCH] lib: Do not use private makefile targets in CMakelists.txt
|
||||
@@ -18,54 +18,19 @@ stemming from
|
||||
$(subst /yocto/upstream/build/tmp/work/cortexa57-poky-linux/fluentbit/3.1.9/git/,,$(abspath $<))
|
||||
...
|
||||
|
||||
Note: lib/cfl/CMakeLists.txt no longer defines __FILENAME__ and
|
||||
lib/cmetrics/CMakeLists.txt already uses __FILE__ unconditionally in
|
||||
this version, so only lib/ctraces and lib/monkey required this change.
|
||||
|
||||
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450]
|
||||
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
|
||||
---
|
||||
lib/cfl/CMakeLists.txt | 8 ++------
|
||||
lib/cmetrics/CMakeLists.txt | 8 ++------
|
||||
lib/ctraces/CMakeLists.txt | 8 ++------
|
||||
lib/monkey/CMakeLists.txt | 4 +---
|
||||
4 files changed, 7 insertions(+), 21 deletions(-)
|
||||
lib/ctraces/CMakeLists.txt | 8 ++------
|
||||
lib/monkey/CMakeLists.txt | 4 +---
|
||||
2 files changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/lib/cfl/CMakeLists.txt b/lib/cfl/CMakeLists.txt
|
||||
index 489570026..06d99cbbe 100644
|
||||
--- a/lib/cfl/CMakeLists.txt
|
||||
+++ b/lib/cfl/CMakeLists.txt
|
||||
@@ -40,12 +40,8 @@ if(NOT MSVC)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
|
||||
endif()
|
||||
|
||||
-# Define __FILENAME__ consistently across Operating Systems
|
||||
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
|
||||
-else()
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
|
||||
-endif()
|
||||
+# Define __FILENAME__
|
||||
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
|
||||
|
||||
|
||||
|
||||
diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
|
||||
index a3385a8ba..80170f8e7 100644
|
||||
--- a/lib/cmetrics/CMakeLists.txt
|
||||
+++ b/lib/cmetrics/CMakeLists.txt
|
||||
@@ -60,12 +60,8 @@ if(NOT MSVC)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
|
||||
endif()
|
||||
|
||||
-# Define __CMT_FILENAME__ consistently across Operating Systems
|
||||
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
|
||||
-else()
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
|
||||
-endif()
|
||||
+# Define __CMT_FILENAME__
|
||||
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
|
||||
|
||||
# Configuration options
|
||||
option(CMT_DEV "Enable development mode" No)
|
||||
diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt
|
||||
index bb2c54fa6..7d59dd834 100644
|
||||
--- a/lib/ctraces/CMakeLists.txt
|
||||
@@ -86,7 +51,7 @@ index bb2c54fa6..7d59dd834 100644
|
||||
# Configuration options
|
||||
option(CTR_DEV "Enable development mode" No)
|
||||
diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
|
||||
index 3dc1ef28a..2d08fc5fd 100644
|
||||
index 45f96d797..cc227fdb0 100644
|
||||
--- a/lib/monkey/CMakeLists.txt
|
||||
+++ b/lib/monkey/CMakeLists.txt
|
||||
@@ -15,10 +15,8 @@ include(GNUInstallDirs)
|
||||
@@ -101,3 +66,6 @@ index 3dc1ef28a..2d08fc5fd 100644
|
||||
|
||||
# Monkey Version
|
||||
set(MK_VERSION_MAJOR 1)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ DEPENDS = "\
|
||||
"
|
||||
DEPENDS:append:libc-musl = " fts"
|
||||
|
||||
SRCREV = "a1e05fc1f703fe0ab0373578896f395a04a7eeb5"
|
||||
SRCREV = "66910c10a4d7eafa810b84229cf2dcf7b0f26f97"
|
||||
SRC_URI = "\
|
||||
git://github.com/fluent/fluent-bit.git;nobranch=1;protocol=https;tag=v${PV} \
|
||||
file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \
|
||||
Reference in New Issue
Block a user