From 2aa7761393c11a8525fb4550cc9324001022263f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 10 Apr 2026 23:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=95=20Sync=202026-04-10=2023:46:17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- netdata/Makefile | 4 +++- ...andling-of-abseil-independently-of-protobuf.patch | 10 +++++----- netdata/patches/003-use-cpp-17.patch | 12 ------------ 3 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 netdata/patches/003-use-cpp-17.patch diff --git a/netdata/Makefile b/netdata/Makefile index 81688c8f..68c86a6b 100644 --- a/netdata/Makefile +++ b/netdata/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata PKG_VERSION:=2.10.0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_MAINTAINER:=Josef Schlehofer , Daniel Engberg PKG_LICENSE:=GPL-3.0-or-later @@ -70,6 +70,8 @@ CMAKE_OPTIONS += \ -DENABLE_PLUGIN_OTEL=Off \ -DENABLE_PLUGIN_OTEL_SIGNAL_VIEWER=Off \ -DENABLE_PLUGIN_GO=Off \ + -DENABLE_PLUGIN_IBM=Off \ + -DENABLE_PLUGIN_SCRIPTS=Off \ -DENABLE_PLUGIN_APPS=Off \ -DENABLE_PLUGIN_CGROUP_NETWORK=Off \ -DENABLE_PLUGIN_CUPS=Off \ diff --git a/netdata/patches/002-support-handling-of-abseil-independently-of-protobuf.patch b/netdata/patches/002-support-handling-of-abseil-independently-of-protobuf.patch index 8136f4f4..53cbf930 100644 --- a/netdata/patches/002-support-handling-of-abseil-independently-of-protobuf.patch +++ b/netdata/patches/002-support-handling-of-abseil-independently-of-protobuf.patch @@ -143,10 +143,10 @@ diff -Naur a/packaging/cmake/Modules/NetdataAbseil.cmake b/packaging/cmake/Modul +endfunction() \ No newline at end of file diff --git a/packaging/cmake/Modules/NetdataProtobuf.cmake b/packaging/cmake/Modules/NetdataProtobuf.cmake -index 5375d13970aa3a..42bf42446be025 100644 +index 5375d13970aa3a..d7c32593aa7652 100644 --- a/packaging/cmake/Modules/NetdataProtobuf.cmake +++ b/packaging/cmake/Modules/NetdataProtobuf.cmake -@@ -24,38 +24,12 @@ function(netdata_bundle_protobuf) +@@ -24,39 +24,11 @@ function(netdata_bundle_protobuf) set(FETCHCONTENT_FULLY_DISCONNECTED Off) if(NEED_ABSL) @@ -155,12 +155,13 @@ index 5375d13970aa3a..42bf42446be025 100644 - set(BUILD_SHARED_LIBS Off) - set(ABSL_BUILD_TESTING Off) - set(absl_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/absl-src") +- set(absl_repo https://github.com/abseil/abseil-cpp) - - message(STATUS "Preparing bundled Abseil (required by bundled Protobuf)") - find_program(PATCH patch REQUIRED) - if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28) - FetchContent_Declare(absl -- GIT_REPOSITORY https://github.com/abseil/abseil-cpp +- GIT_REPOSITORY ${absl_repo} - GIT_TAG ${ABSL_TAG} - SOURCE_DIR ${absl_SOURCE_DIR} - PATCH_COMMAND ${CMAKE_SOURCE_DIR}/packaging/cmake/patches/apply-patches.sh @@ -171,7 +172,7 @@ index 5375d13970aa3a..42bf42446be025 100644 - ) - else() - FetchContent_Declare(absl -- GIT_REPOSITORY https://github.com/abseil/abseil-cpp +- GIT_REPOSITORY ${absl_repo} - GIT_TAG ${ABSL_TAG} - SOURCE_DIR ${absl_SOURCE_DIR} - PATCH_COMMAND ${CMAKE_SOURCE_DIR}/packaging/cmake/patches/apply-patches.sh @@ -184,7 +185,6 @@ index 5375d13970aa3a..42bf42446be025 100644 endif() - FetchContent_MakeAvailable_NoInstall(absl) - message(STATUS "Finished preparing bundled Abseil") -+ + netdata_bundle_abseil() + set(BUNDLED_ABSEIL PARENT_SCOPE) endif() diff --git a/netdata/patches/003-use-cpp-17.patch b/netdata/patches/003-use-cpp-17.patch deleted file mode 100644 index d8feb501..00000000 --- a/netdata/patches/003-use-cpp-17.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2024-11-08 03:09:18.000000000 +0700 -+++ b/CMakeLists.txt 2024-11-10 05:54:38.197675500 +0700 -@@ -33,7 +33,7 @@ - set(CMAKE_INSTALL_MESSAGE LAZY) - - set(CMAKE_C_STANDARD 11) --set(CMAKE_CXX_STANDARD 14) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "netdata") - - option(USE_CXX_11 "Use C++11 instead of C++14 (should only be used on legacy systems that cannot support C++14, may disable some features)" False)