From patchwork Fri Mar 14 20:50:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 59039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81A7FC35FF6 for ; Fri, 14 Mar 2025 20:52:14 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web10.4420.1741985526863023184 for ; Fri, 14 Mar 2025 13:52:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=f0hyCoy/; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-256628-202503142052036b733474f745de74d2-_ccsnw@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202503142052036b733474f745de74d2 for ; Fri, 14 Mar 2025 21:52:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=Inb76mv4BCtqT6a6l7DEO/frIPy8MNqZg5qh4b7Haqw=; b=f0hyCoy/hP+C4gtOw2tIp0CC6l0GRPb+F6FuROOm5w9sDlGXANLXwOXNUcpf0AbnLvWH8G Gg5iE6oUpte1qFniIZPYKNOP1YEipb/NPOU5puhdzQMJslDlT0KwZJhEhML5sOMksCZ5w7GC BgCUh3vRmNQ7zd3EdrxovZUG+5tcV52VRwLZMnaDcG3FvzCofoNvj34dcP8Cn7cuWk4Ms9N6 i8CivFDgAYRtFe1MwEyg63p01acFfrPmNp5PtR+pz9XDME6aEfmP2lA8RN6sm4dHmLQY0H2R aZODUf/aY17p80HP+Tku5MNkgh9TYILfZ7sPDfC2OoDX7sp9rrrO+esA==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 1/7] fluentbit: set UPSTREAM_CHECK_GITTAGREGEX Date: Fri, 14 Mar 2025 21:50:29 +0100 Message-Id: <20250314205035.386919-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Mar 2025 20:52:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115988 From: Peter Marko "devtool latest-version fluentbit" shows currently: INFO: Latest version: 20220215 which is something old. This change switches it to: INFO: Latest version: 3.2.8 which was released on 2025-02-27. Signed-off-by: Peter Marko --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb index b895c7da0d..30a62dbc12 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb @@ -31,6 +31,9 @@ SRC_URI:append:libc-musl = "\ file://0005-Use-posix-strerror_r-with-musl.patch \ " +# prefix tag with "v" to avoid upgrade to random tags like "20220215" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P(\d+(\.\d+)+))" + S = "${WORKDIR}/git" PACKAGECONFIG ??= "\ From patchwork Fri Mar 14 20:50:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 59037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C256C28B30 for ; Fri, 14 Mar 2025 20:52:14 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web10.4420.1741985526863023184 for ; Fri, 14 Mar 2025 13:52:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=Nx/Z74Iw; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-256628-20250314205207af41e663ebb65b8168-qdgnm3@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20250314205207af41e663ebb65b8168 for ; Fri, 14 Mar 2025 21:52:07 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=JjEdApuRL2j9cxmkGE9GNKN9TdZdk4gO+aU44+S3Wbo=; b=Nx/Z74IwhRdmpvU5gK9uhx0FzPhD3cOpn5Fto+zFUt92a+Zrt4tQThfDD4Lq8vJw2/mvg0 EK6ggXWuoxDHjhrwaxm3FmD4/Hm8pPJV0fFlRF9J3FVLGmW+VOb6BK+Q8G5XANt7+70NRG95 YRCZhr7xkApsq5qS3fnh4HkNsM4sflKJnzpxBUXzKK63A8lhKdDDFyo4xr0KVOE+nkX8Ygmw yYnOwWGVo7rmlUYejCs95c2MH/TCpfQQl5U54DVeYYXksc/JkQHyvIRqc6F1jbzAS8yrpXfS mPKE1DNJpiXeDmUrSeQXe4SgBFpD6XE3BYiT5JAGk/gyQ0Th4H6CYE3g==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 2/7] fluentbit: upgrade 3.2.1 -> 3.2.8 Date: Fri, 14 Mar 2025 21:50:30 +0100 Message-Id: <20250314205035.386919-2-peter.marko@siemens.com> In-Reply-To: <20250314205035.386919-1-peter.marko@siemens.com> References: <20250314205035.386919-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Mar 2025 20:52:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115989 From: Peter Marko Handle CVE-2024-50608 and CVE-2024-50609 (in 3.2.7). Drop two patches addressed upstream. Refresh remaining patches. zstd is now bundled without possibility to unbundle. Signed-off-by: Peter Marko --- ...rivate-makefile-targets-in-CMakelist.patch | 10 ++-- ...ts.txt-Revise-init-manager-deduction.patch | 4 +- ...d-cmake-try_run-when-cross-compiling.patch | 42 -------------- ..._text.c-fix-wrong-pointer-assignment.patch | 56 ------------------- ...{fluentbit_3.2.1.bb => fluentbit_3.2.8.bb} | 11 ++-- 5 files changed, 11 insertions(+), 112 deletions(-) delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0005-cprof_encode_text.c-fix-wrong-pointer-assignment.patch rename meta-oe/recipes-extended/fluentbit/{fluentbit_3.2.1.bb => fluentbit_3.2.8.bb} (94%) 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 index 642a73dac2..fae98f1f5d 100644 --- 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 @@ -70,8 +70,8 @@ diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt index e47ba022d..0ddfd5f97 100644 --- a/lib/ctraces/CMakeLists.txt +++ b/lib/ctraces/CMakeLists.txt -@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 5) - set(CTR_VERSION_PATCH 7) +@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 6) + set(CTR_VERSION_PATCH 0) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") -# Define __FILENAME__ consistently across Operating Systems @@ -95,9 +95,9 @@ index 028240bcc..b386cb726 100644 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra") -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() -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") ++endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") +-endif() # Monkey Version set(MK_VERSION_MAJOR 1) 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 index 4da1650bc1..8dd4da47ec 100644 --- 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 @@ -18,7 +18,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8404b65c1..0c7876058 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -540,7 +540,7 @@ if(FLB_BINARY) +@@ -546,7 +546,7 @@ if(FLB_BINARY) set(SYSTEMD_UNITDIR /lib/systemd/system) endif() @@ -27,7 +27,7 @@ index 8404b65c1..0c7876058 100644 set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") configure_file( "${PROJECT_SOURCE_DIR}/init/systemd.in" -@@ -548,7 +548,7 @@ if(FLB_BINARY) +@@ -554,7 +554,7 @@ if(FLB_BINARY) ) install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR}) install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch deleted file mode 100644 index b711b413bd..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5f3bfd51851c6700b4dfd2ac25e83e5306b923f8 Mon Sep 17 00:00:00 2001 -From: Patrick Wicki -Date: Sat, 5 Oct 2024 21:36:12 +0200 -Subject: [PATCH] wasm: avoid cmake try_run when cross-compiling for x86 - -This fixes building the wasm micro runtime used when enabling wasm -support in fluentbit. -cmake try_run does not work when cross-compiling because the test program -cannot be executed: - -| CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately: -| TEST_WRGSBASE_RESULT (advanced) -| For details see .../fluentbit/3.1.9/build/TryRunResults.cmake -| Write linear memory base addr to x86 GS register disabled -| -- Configuring incomplete, errors occurred! - -Since we cannot run the test program, assume that the instruction is not -available and disable the option. - -This patch is no longer needed once fluentbit updates WAMR, as it's been -fixed in https://github.com/bytecodealliance/wasm-micro-runtime/pull/3066. - -Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/8744] - -Signed-off-by: Patrick Wicki ---- - .../build-scripts/config_common.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake -index e73ebc85f..c2504e007 100644 ---- a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake -+++ b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake -@@ -408,7 +408,7 @@ if (WAMR_BUILD_STATIC_PGO EQUAL 1) - add_definitions (-DWASM_ENABLE_STATIC_PGO=1) - message (" AOT static PGO enabled") - endif () --if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1) -+if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1 OR CMAKE_CROSSCOMPILING) - add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=1) - message (" Write linear memory base addr to x86 GS register disabled") - elseif (WAMR_BUILD_TARGET STREQUAL "X86_64" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-cprof_encode_text.c-fix-wrong-pointer-assignment.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-cprof_encode_text.c-fix-wrong-pointer-assignment.patch deleted file mode 100644 index 1d2513aefb..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-cprof_encode_text.c-fix-wrong-pointer-assignment.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2e39a3cea7d03721298e90fad70560c541b092a5 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Sat, 16 Nov 2024 20:55:37 +0100 -Subject: [PATCH] cprof_encode_text.c: fix wrong pointer assignment - -Fix cprofiles build. - -Upstream-Status: Submitted [https://github.com/fluent/cprofiles/pull/3] - -Signed-off-by: Thomas Devoogdt -Signed-off-by: Patrick Wicki ---- - lib/cprofiles/src/cprof_encode_text.c | 6 +++--- - lib/cprofiles/src/cprof_profile.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib/cprofiles/src/cprof_encode_text.c b/lib/cprofiles/src/cprof_encode_text.c -index 218a72b5b..ab2d6247d 100644 ---- a/lib/cprofiles/src/cprof_encode_text.c -+++ b/lib/cprofiles/src/cprof_encode_text.c -@@ -1909,7 +1909,7 @@ static int encode_cprof_resource_profiles( - struct cprof_resource_profiles *instance) { - int result; - struct cfl_list *iterator; -- struct cprof_scope_profile *scope_profile; -+ struct cprof_scope_profiles *scope_profiles; - - result = encode_string(context, - CFL_TRUE, -@@ -1958,11 +1958,11 @@ static int encode_cprof_resource_profiles( - - cfl_list_foreach(iterator, - &instance->scope_profiles) { -- scope_profile = cfl_list_entry( -+ scope_profiles = cfl_list_entry( - iterator, - struct cprof_scope_profiles, _head); - -- result = encode_cprof_scope_profiles(context, scope_profile); -+ result = encode_cprof_scope_profiles(context, scope_profiles); - - if (result != CPROF_ENCODE_TEXT_SUCCESS) { - return result; -diff --git a/lib/cprofiles/src/cprof_profile.c b/lib/cprofiles/src/cprof_profile.c -index 66d62b361..d059d0376 100644 ---- a/lib/cprofiles/src/cprof_profile.c -+++ b/lib/cprofiles/src/cprof_profile.c -@@ -98,7 +98,7 @@ void cprof_profile_destroy(struct cprof_profile *instance) - struct cfl_list *iterator_backup; - struct cprof_attribute_unit *attribute_unit; - struct cprof_value_type *value_type; -- struct cprof_mapping *location; -+ struct cprof_location *location; - struct cprof_function *function; - struct cfl_list *iterator; - struct cprof_mapping *mapping; diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb similarity index 94% rename from meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb rename to meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb index 30a62dbc12..fbaee9e121 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.1.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb @@ -17,14 +17,12 @@ DEPENDS = "\ " DEPENDS:append:libc-musl = " fts" -SRCREV = "600b5a955b5ef7b9d025e0c128432260d0c6a5f1" +SRCREV = "d13e8e4ab2029fa92600b7d1d0da28f8dcc350eb" SRC_URI = "\ - git://github.com/fluent/fluent-bit.git;branch=master;protocol=https \ + git://github.com/fluent/fluent-bit.git;branch=3.2;protocol=https \ file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \ file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \ file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \ - file://0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch \ - file://0005-cprof_encode_text.c-fix-wrong-pointer-assignment.patch \ " SRC_URI:append:libc-musl = "\ file://0004-chunkio-Link-with-fts-library-with-musl.patch \ @@ -114,9 +112,8 @@ PACKAGECONFIG[windows-defaults] = "-DFLB_WINDOWS_DEFAULTS=Yes,-DFLB_WINDOWS_DEFA # individual plugins then to enable (e.g. using EXTRA_OECMAKE:append = " -DFLB_FOOBAR=ON") PACKAGECONFIG[minimal] = "-DFLB_MINIMAL=Yes,-DFLB_MINIMAL=No" -# Without zstd dependency, kafka plugin build fails at link attempt against native libzstd.so -PACKAGECONFIG[in-kafka] = "-DFLB_IN_KAFKA=ON,-DFLB_IN_KAFKA=OFF,librdkafka zstd curl" -PACKAGECONFIG[out-kafka] = "-DFLB_OUT_KAFKA=ON,-DFLB_OUT_KAFKA=OFF,librdkafka zstd curl" +PACKAGECONFIG[in-kafka] = "-DFLB_IN_KAFKA=ON,-DFLB_IN_KAFKA=OFF,librdkafka curl" +PACKAGECONFIG[out-kafka] = "-DFLB_OUT_KAFKA=ON,-DFLB_OUT_KAFKA=OFF,librdkafka curl" SYSTEMD_SERVICE:${PN} = "fluent-bit.service" From patchwork Fri Mar 14 20:50:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 59038 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7AC7FC282EC for ; Fri, 14 Mar 2025 20:52:14 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web11.4450.1741985533457889545 for ; Fri, 14 Mar 2025 13:52:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=CyVXJpKj; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-256628-2025031420521174ce15bb53d6844607-_v_0g9@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 2025031420521174ce15bb53d6844607 for ; Fri, 14 Mar 2025 21:52:11 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=ISlQcBGl7lmXcB9oWclOsfOJ4KOokjaFIiVCyYfpBXQ=; b=CyVXJpKjucrOgvFX0r/xwn6/2XqCjMDBUD/PLshSRg2rV70D5tM+xOyMuJekwFqzOELW66 5poi6LjM/oieDH2qHbrx993X2f9gKWLiNUrREOmk3uL6vhVeGA6Xw2Ap1w45TaF0VTKYwut7 PJMZYPFYw9WmR14JyducneSLpbjb2+cPnw5ykFriimEcn6roCPpcQn2BXmNo0X6zUWHrB04c xFzxFhxQbP3SMHRLui1l9BoefqWz7Q/3cbdymm5x0tT8WtSVbJFD4PRcE00teSIxM3PSDCr/ 5GSmKEmYJaDihwX8LvdxPc/49j3cFbqid1nfbVGj3TJ6zQaeEk5J6TWQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 3/7] fluentbit: drop compiler optimization package configs Date: Fri, 14 Mar 2025 21:50:31 +0100 Message-Id: <20250314205035.386919-3-peter.marko@siemens.com> In-Reply-To: <20250314205035.386919-1-peter.marko@siemens.com> References: <20250314205035.386919-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Mar 2025 20:52:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115990 From: Peter Marko These manipulate compiler flags instead of using what yocto provides. * "coverage" adds paths to binaries and thus causes buildpaths errors * "small" strips binaries, so causes already-stripped error. * DEBUG_BUILD is the correct way to enable debug/release flags in yocto Signed-off-by: Peter Marko --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb index fbaee9e121..94fbed0962 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb @@ -48,7 +48,6 @@ PACKAGECONFIG ??= "\ proxy-go \ record-accessor \ regex \ - release \ signv4 \ sqldb \ stream-processor \ @@ -73,9 +72,7 @@ PACKAGECONFIG[backtrace] = "-DFLB_BACKTRACE=Yes,-DFLB_BACKTRACE=No" PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No" PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No" PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml" -PACKAGECONFIG[coverage] = "-DFLB_COVERAGE=Yes,-DFLB_COVERAGE=No" PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No" -PACKAGECONFIG[debug] = "-DFLB_DEBUG=Yes,-DFLB_DEBUG=No" PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No" PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No" PACKAGECONFIG[http-client-debug] = "-DFLB_HTTP_CLIENT_DEBUG=Yes,-DFLB_HTTP_CLIENT_DEBUG=No" @@ -91,11 +88,9 @@ PACKAGECONFIG[posix-tls] = "-DFLB_POSIX_TLS=Yes,-DFLB_POSIX_TLS=No" PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No" PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No" PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No" -PACKAGECONFIG[release] = "-DFLB_RELEASE=Yes,-DFLB_RELEASE=No" PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No" PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No" PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No" -PACKAGECONFIG[small] = "-DFLB_SMALL=Yes,-DFLB_SMALL=No" PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No" PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No" PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No" @@ -119,6 +114,10 @@ SYSTEMD_SERVICE:${PN} = "fluent-bit.service" inherit cmake systemd pkgconfig +# disable manipulation of compiler flags and CMAKE_BUILD_TYPE +# release and coverage are off by default, disable also debug +EXTRA_OECMAKE += "-DFLB_DEBUG=No" + FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}" TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}" TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2" From patchwork Fri Mar 14 20:50:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 59041 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F4E1C35FF6 for ; Fri, 14 Mar 2025 20:52:24 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web11.4450.1741985533457889545 for ; Fri, 14 Mar 2025 13:52:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=FF3nyppk; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-256628-20250314205215d1e7b505179623eb88-auo963@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20250314205215d1e7b505179623eb88 for ; Fri, 14 Mar 2025 21:52:15 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=d7eqyQIm60NraOLU0W/wTxvfUCUsUjE+H4lcPyQzuwM=; b=FF3nyppkIyNT+xYe88Fg8gggKMp0rHSIuK1AVqxEQjvdmFqSdTHnr8C4fMe+UM7ar9/2u/ E1YhAcpruZjkau4RIs2+XPYgwJqr/4c21OyGdY9CHx1wbzp02Z7bgpYGO03yqOmNKQ5nJfhJ 66yzCJsvLk3FkZ4A9PQUazEVOKJsWlU4c0Q4k+rhsjbatjOHQ/pknGgezWAQzZ26uzoHaZGQ j+abMwF+Rl/r36r7sYG0WiVLDV1xWpgVp5nLUEVnM6tk0hbpfoTl063tCVNsGi6DmAWmYIZw b2bJ9q6nlWIWyJQ94CL34LazfPx/Y3F0Rhp6SFm9VEfAR7CCCKBHV74Q==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 4/7] fluentbit: fix valgrind package config Date: Fri, 14 Mar 2025 21:50:32 +0100 Message-Id: <20250314205035.386919-4-peter.marko@siemens.com> In-Reply-To: <20250314205035.386919-1-peter.marko@siemens.com> References: <20250314205035.386919-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Mar 2025 20:52:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115991 From: Peter Marko Add valgrind dependency to fix: fatal error: valgrind/valgrind.h: No such file or directory Signed-off-by: Peter Marko --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb index 94fbed0962..cd4cba6a14 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb @@ -97,7 +97,7 @@ PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No" PACKAGECONFIG[tls] = "-DFLB_TLS=Yes,-DFLB_TLS=No" PACKAGECONFIG[trace] = "-DFLB_TRACE=Yes,-DFLB_TRACE=No" PACKAGECONFIG[utf8-encoder] = "-DFLB_UTF8_ENCODER=Yes,-DFLB_UTF8_ENCODER=No" -PACKAGECONFIG[valgrind] = "-DFLB_VALGRIND=Yes,-DFLB_VALGRIND=No" +PACKAGECONFIG[valgrind] = "-DFLB_VALGRIND=Yes,-DFLB_VALGRIND=No,valgrind" PACKAGECONFIG[wamrc] = "-DFLB_WAMRC=Yes,-DFLB_WAMRC=No" PACKAGECONFIG[wasm-stack-protect] = "-DFLB_WASM_STACK_PROTECT=Yes,-DFLB_WASM_STACK_PROTECT=No" PACKAGECONFIG[wasm] = "-DFLB_WASM=Yes,-DFLB_WASM=No" From patchwork Fri Mar 14 20:50:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 59042 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DB32C28B2F for ; Fri, 14 Mar 2025 20:52:24 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.4453.1741985539596148229 for ; Fri, 14 Mar 2025 13:52:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=aWrhGq8L; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-202503142052172bc927be86215666bd-6yfosn@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202503142052172bc927be86215666bd for ; Fri, 14 Mar 2025 21:52:17 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=4zoA4kCxwqoqAsQm9rh+MOZjWDrW7Kxe2Aj07Xxt3Q0=; b=aWrhGq8L1G8fpyLl404kq6jD89GGMzXECo7q1aGsn+01Hgn6iFSWt6fYVF8FYDcNAqRPaY DpT4/AMM/C8+Q76rXXYNKmFHAgGcSLmu9Fu+WxzRtUJL5kifIPdRoiyD57mFxNZC8n8BSU1+ Qm0SsTJexpw6v5YLcbg2piwgkpaR/mAgXV/lB/fesCP8t/0WH6XTj8grdCiJv1PoL5B8Llf8 Hx0TwhqCGaSjF/zNfIYwci+qleBtZAMWeeoxeipdclt3vvUwQtUaXVPHgSVrdj8oarjSwRst xSLZ/5+G9BbcNktEtzC8GJ4uOm3fU0s3xo5C9P0UXpzN0R8BsjGe9u2Q==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 5/7] fluentbit: fix shared-lib package config Date: Fri, 14 Mar 2025 21:50:33 +0100 Message-Id: <20250314205035.386919-5-peter.marko@siemens.com> In-Reply-To: <20250314205035.386919-1-peter.marko@siemens.com> References: <20250314205035.386919-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Mar 2025 20:52:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115992 From: Peter Marko Add library to packaged files to fix: ERROR: fluentbit-3.2.8-r0 do_package: QA Issue: fluentbit: Files/directories were installed but not shipped in any package: /usr/lib/fluent-bit /usr/lib/fluent-bit/libfluent-bit.so Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. fluentbit: 2 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Peter Marko --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb index cd4cba6a14..c7fc7d1e19 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb @@ -139,3 +139,6 @@ do_configure:prepend() { do_compile:append() { find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g' } + +# needed for shared-lib package config +FILES:${PN} += "${libdir}/fluent-bit" From patchwork Fri Mar 14 20:50:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 59040 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B89AC282EC for ; Fri, 14 Mar 2025 20:52:24 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.4453.1741985539596148229 for ; Fri, 14 Mar 2025 13:52:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=I6advU51; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-202503142052218a261d10380e2af460-duusya@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202503142052218a261d10380e2af460 for ; Fri, 14 Mar 2025 21:52:21 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=FzqkZFnOdh7CArB+PymJgiQFg1UerHRsvmVsaacLqWE=; b=I6advU51+x36oEWznzGA4pLnZ4NWKwKPC0xnUfF1dZ6+t95EtX1X0XZFk0haet0c668vrV imTRXgFu1QkBOrLh3aw8o9FPJYSf2lL21IE+9Tm+u+rYJAyBtRqdOg33FnWRjIOV2Vqs8dRa XmjbAX+Fr2WoXXew8Kk0GhV/+OWFTw9rnlHlhwD5Zd6J1v1G86yyQ79bk23fL9tbGylGYRWe n8zqP5TPmGuKuUC8264kgr4lDF2LYXi85OJbWhr/lce7S73Yl+hAsMJARsFz6/v7Um2QWo0Y 7dpPV4WpbZr1TepOq+DuS73ByPRPAwW1G2k9U9lxS/CUFILwIoKTN0Ww==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 6/7] fluentbit: add profiles package config Date: Fri, 14 Mar 2025 21:50:34 +0100 Message-Id: <20250314205035.386919-6-peter.marko@siemens.com> In-Reply-To: <20250314205035.386919-1-peter.marko@siemens.com> References: <20250314205035.386919-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Mar 2025 20:52:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115993 From: Peter Marko Since the recipe tries to list every single option, add this one which is missing. It is enabled by default in cmake to enabling it by default in package config retains current settings. Signed-off-by: Peter Marko --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb index c7fc7d1e19..406a5b7b9e 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb @@ -45,6 +45,7 @@ PACKAGECONFIG ??= "\ metrics \ parser \ prefer-system-libs \ + profiles \ proxy-go \ record-accessor \ regex \ @@ -85,6 +86,7 @@ PACKAGECONFIG[metrics] = "-DFLB_METRICS=Yes,-DFLB_METRICS=No" PACKAGECONFIG[mtrace] = "-DFLB_MTRACE=Yes,-DFLB_MTRACE=No" PACKAGECONFIG[parser] = "-DFLB_PARSER=Yes,-DFLB_PARSER=No" PACKAGECONFIG[posix-tls] = "-DFLB_POSIX_TLS=Yes,-DFLB_POSIX_TLS=No" +PACKAGECONFIG[profiles] = "-DFLB_PROFILES=Yes,-DFLB_PROFILES=No" PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No" PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No" PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No" From patchwork Fri Mar 14 20:50:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 59043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54C78C28B30 for ; Fri, 14 Mar 2025 20:52:34 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.4453.1741985539596148229 for ; Fri, 14 Mar 2025 13:52:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=l8+QU5EW; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-20250314205223e695d3a5ec3b1c27d3-1fwk2h@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20250314205223e695d3a5ec3b1c27d3 for ; Fri, 14 Mar 2025 21:52:23 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=jgHVlSLZZSHNlUuTXTBrHmtvPVkpQHgRce2lK5BpQwA=; b=l8+QU5EWsdY06VwItJLX7E05VrfGFrv1p0ltiZmjLX+JMjEgOsc5KkWYEoto1/Zj0ybudX 3RZU5dZcpexQJZzygQBhCpigSgJsArK3snIDwXAhAa3MHWn7DNvqxB9RMYqKO60yCSLOdWr2 npFDuFF9J+nbEVReWzEOy1SBzUvBmgK1QvTHhE1IdOvCF4eB/4VBuQPzPZz17h0AL/YmLp6G GSCuEaGhwkRn0+xLqyyi8ChNMxhBzb0mUdO37yUg6XJmw1uUCUvcKIj9Ki+XwhLZ+u9oGhkD hXpEj7NKt8CNs7S4SV7as6WFb19JGyFvTk1Ka3qoBobaIjRM14WQXCQA==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 7/7] fluentbit: fix aws-error-reporter package config Date: Fri, 14 Mar 2025 21:50:35 +0100 Message-Id: <20250314205035.386919-7-peter.marko@siemens.com> In-Reply-To: <20250314205035.386919-1-peter.marko@siemens.com> References: <20250314205035.386919-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Mar 2025 20:52:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115994 From: Peter Marko Compilation fails with several errors in flb_aws_error_reporter.c Signed-off-by: Peter Marko --- meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb index 406a5b7b9e..59e23567b1 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb @@ -129,6 +129,7 @@ EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" +SECURITY_STRINGFORMAT:remove = "${@bb.utils.contains('PACKAGECONFIG', 'aws-error-reporter', '-Werror=format-security', '', d)}" do_configure:prepend() { sed -i \