From 04473965b42b795b53adc5e75192b49ce9cc902d Mon Sep 17 00:00:00 2001 From: Luca Palano Date: Fri, 2 Aug 2019 10:45:43 +0200 Subject: Netdata upgrade: 1.8.0 -> 1.16.0 Signed-off-by: Luca Palano Signed-off-by: Khem Raj --- .../netdata/0001-Correct-Timeout-issue.patch | 21 ----------- .../netdata/0001-Correct-timeout-issue.patch | 42 ++++++++++++++++++++++ .../0001-makefile-Do-not-build-contrib-dir.patch | 27 -------------- ...0002-Makefiles-does-not-build-contrib-dir.patch | 24 +++++++++++++ .../recipes-webadmin/netdata/netdata_git.bb | 16 ++++----- 5 files changed, 72 insertions(+), 58 deletions(-) delete mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch delete mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch deleted file mode 100644 index abea0d66bd..0000000000 --- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: git/plugins.d/charts.d.plugin -=================================================================== ---- git.orig/plugins.d/charts.d.plugin -+++ git/plugins.d/charts.d.plugin -@@ -246,16 +246,6 @@ else - info "configuration file '$myconfig' not found. Using defaults." - fi - --# we check for the timeout command, after we load our --# configuration, so that the user may overwrite the --# timeout command we use, providing a function that --# can emulate the timeout command we need: --# > timeout SECONDS command ... --if [ $check_for_timeout -eq 1 ] -- then -- require_cmd timeout || exit 1 --fi -- - # ----------------------------------------------------------------------------- - # internal checks - diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch new file mode 100644 index 0000000000..c4be8270ca --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch @@ -0,0 +1,42 @@ +From ccaf4225239c3092a51cf44f2ab0a2141b8a5fa6 Mon Sep 17 00:00:00 2001 +From: Luca Palano +Date: Wed, 5 Dec 2018 10:36:52 +0100 +Subject: [PATCH 1/2] Correct of timeout issue + +The timeout issue has been disabled + +Signed-off-by: Luca Palano +--- + collectors/charts.d.plugin/charts.d.plugin.in | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in +index 0df6c30c..63ea4506 100755 +--- a/collectors/charts.d.plugin/charts.d.plugin.in ++++ b/collectors/charts.d.plugin/charts.d.plugin.in +@@ -156,7 +156,7 @@ restart_timeout=$((3600 * 4)) + dryrunner=0 + + # check for timeout command +-check_for_timeout=1 ++check_for_timeout=0 + + # the default enable/disable value for all charts + enable_all_charts="yes" +@@ -251,9 +251,10 @@ time_divisor=$((time_divisor)) + # timeout command we use, providing a function that + # can emulate the timeout command we need: + # > timeout SECONDS command ... +-if [ $check_for_timeout -eq 1 ]; then +- require_cmd timeout || exit 1 +-fi ++#if [ $check_for_timeout -eq 1 ] ++# then ++# require_cmd timeout || exit 1 ++#fi + + # ----------------------------------------------------------------------------- + # internal checks +-- +2.20.1 (Apple Git-117) + diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch deleted file mode 100644 index 6a0d75e37b..0000000000 --- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 87f868918a9ae1dcf93e01f3e177d185c19a149a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 13 Jul 2017 14:32:09 -0700 -Subject: [PATCH] makefile: Do not build contrib dir - -It contains debian build iteams anyway - -Signed-off-by: Khem Raj ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 2ea9e40..acb1bd8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,6 @@ SUBDIRS = \ - src \ - system \ - web \ -- contrib \ - tests \ - $(NULL) - --- -2.13.2 - diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch new file mode 100644 index 0000000000..f0887fed02 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch @@ -0,0 +1,24 @@ +From 95e1da77de80e38068bb2739faeaad49105700cf Mon Sep 17 00:00:00 2001 +From: Luca Palano +Date: Mon, 15 Jul 2019 10:16:32 +0200 +Subject: [PATCH 2/2] Makefiles does not build contrib + +Signed-off-by: Luca Palano +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index bc928bba..ba9edc6b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -54,7 +54,6 @@ dist_noinst_DATA= \ + CHANGELOG.md \ + cppcheck.sh \ + configs.signatures \ +- contrib \ + netdata.cppcheck \ + netdata.spec \ + package.json \ +-- +2.20.1 (Apple Git-117) diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index 390fa4ba9b..811c2c5223 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -1,19 +1,17 @@ HOMEPAGE = "https://github.com/firehol/netdata/" SUMMARY = "Real-time performance monitoring" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=95b49e9ea979a337578f13c2a3ab9535 \ - file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - " +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \ - file://0001-makefile-Do-not-build-contrib-dir.patch \ + file://0002-Makefiles-does-not-build-contrib-dir.patch \ " -SRCREV = "89ed309252981ddd50f697fde4fe93019cb3e652" -PV = "1.8.0+git${SRCPV}" +SRCREV = "2c4146832061635273d153a5174c85fb1d967d57" +PV = "1.16.0+git${SRCPV}" # patch to disable timeout because timeout are not available with actual version # of core-utils -SRC_URI += "file://0001-Correct-Timeout-issue.patch" +SRC_URI += "file://0001-Correct-timeout-issue.patch" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" @@ -25,9 +23,7 @@ S = "${WORKDIR}/git" DEPENDS += "zlib util-linux" -inherit pkgconfig autotools useradd systemd - -LDFLAGS += "-pthread" +inherit pkgconfig autotools-brokensep useradd systemd #systemd SYSTEMD_PACKAGES = "${PN}" -- cgit 1.2.3-korg