From 1278eec776e86659b3e812148796a53d0f865edc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 3 Mar 2022 16:30:16 +0100 Subject: [PATCH] netdata: update to version 1.33.1 - Switch to upstream's release tarball Requires to add PKG_BUILD_DIR since netdata is extracted to the folder netdata-v1.33.1 instead of the previous solution where there was missing v - Disable anomaly detection by default This avoids adding a new dependencies to netdata Fixes: Package netdata is missing dependencies for the following libraries: libatomic.so.1 libstdc++.so.6 - Add FreeBSD patch to have smaller package and to avoid clutter in WebUI Signed-off-by: Michal Vasilek [add commit message, add FreeBSD patch] Signed-off-by: Josef Schlehofer --- admin/netdata/Makefile | 15 +- .../002-extra-patch-web_gui_index.html.patch | 28 - ... => 002-extra-patch-web_gui_main.js.patch} | 0 ...lectors_python.d.plugin_Makefile.am.patch} | 2 +- ...in_python__modules_bases_loaders.py.patch} | 0 admin/netdata/patches/005-freebsd.patch | 1437 +++++++++++++++++ .../006-patch-web_gui_index.html.patch | 17 - 7 files changed, 1449 insertions(+), 50 deletions(-) delete mode 100644 admin/netdata/patches/002-extra-patch-web_gui_index.html.patch rename admin/netdata/patches/{003-extra-patch-web_gui_main.js.patch => 002-extra-patch-web_gui_main.js.patch} (100%) rename admin/netdata/patches/{004-patch-collectors_python.d.plugin_Makefile.am.patch => 003-patch-collectors_python.d.plugin_Makefile.am.patch} (98%) rename admin/netdata/patches/{005-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch => 004-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch} (100%) create mode 100644 admin/netdata/patches/005-freebsd.patch delete mode 100644 admin/netdata/patches/006-patch-web_gui_index.html.patch diff --git a/admin/netdata/Makefile b/admin/netdata/Makefile index 6ce0c4b88c..f97f52e6bc 100644 --- a/admin/netdata/Makefile +++ b/admin/netdata/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata -PKG_VERSION:=1.30.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.33.1 +PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Josef Schlehofer , Daniel Engberg PKG_LICENSE:=GPL-3.0-or-later @@ -17,8 +17,9 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:my-netdata:netdata PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/netdata/netdata/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e05f8b59d283fb2844280455b9481a2f9104730fd77f535312ff2fec40a6bc11 +PKG_SOURCE_URL:=https://github.com/netdata/netdata/releases/download/v$(PKG_VERSION) +PKG_HASH:=20ba8695d87187787b27128ac3aab9b09aa29ca6b508c48542e0f7d50ec9322b +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -62,8 +63,14 @@ CONFIGURE_ARGS += \ --disable-plugin-xenstat \ --disable-backend-prometheus-remote-write \ --disable-unit-tests \ + --disable-ml \ --disable-cloud +define Build/Configure + $(SED) 's/m4_esyscmd(\[git describe .*\])/$(PKG_VERSION)/' $(PKG_BUILD_DIR)/configure.ac + $(Build/Configure/Default) +endef + define Package/netdata/conffiles /etc/netdata/ endef diff --git a/admin/netdata/patches/002-extra-patch-web_gui_index.html.patch b/admin/netdata/patches/002-extra-patch-web_gui_index.html.patch deleted file mode 100644 index 93f6537607..0000000000 --- a/admin/netdata/patches/002-extra-patch-web_gui_index.html.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/web/gui/index.html -+++ b/web/gui/index.html -@@ -90,7 +90,9 @@ - -