From aa57c0f3b9707d4f340b2bf43d29b29f88bef50b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Jul 2017 22:40:08 -0700 Subject: netdata: Upgrade to 1.6.0 Licence files has gotten cosmetic changes additionally checksum COPYING file. Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../netdata/0001-Correct-Timeout-issue.patch | 32 ++++++++++++---------- .../0001-makefile-Do-not-build-contrib-dir.patch | 27 ++++++++++++++++++ .../recipes-webadmin/netdata/netdata_git.bb | 14 ++++++---- 3 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-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 index d5529a2a68..abea0d66bd 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch @@ -1,19 +1,21 @@ -diff --git a/plugins.d/charts.d.plugin b/plugins.d/charts.d.plugin -index 40c0356..bca57b3 100755 ---- a/plugins.d/charts.d.plugin -+++ b/plugins.d/charts.d.plugin -@@ -184,10 +184,10 @@ fi - # timeout command we use, providing a function that - # can emulate the timeout command we need: - # > timeout SECONDS command ... +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 +- then +- require_cmd timeout || exit 1 -fi -+#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-makefile-Do-not-build-contrib-dir.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch new file mode 100644 index 0000000000..9a3a4a5519 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch @@ -0,0 +1,27 @@ +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 3ccf82f8..a852e529 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -52,7 +52,6 @@ SUBDIRS = \ + src \ + system \ + web \ +- contrib \ + $(NULL) + + dist_noinst_DATA= \ +-- +2.13.2 + diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index de140641c5..1003662110 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -1,11 +1,15 @@ HOMEPAGE = "https://github.com/firehol/netdata/" SUMMARY = "Real-time performance monitoring" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=747afe070ea9d6c2be0a31353609a35b" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a4a3b650ea3f74269cdfd45a3550e219 \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + " -SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" -SRCREV = "36c1304e37094174ea51001903058e65053107ca" -PV = "1.0.1+git${SRCPV}" +SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \ + file://0001-makefile-Do-not-build-contrib-dir.patch \ +" +SRCREV = "f5fa346a188e906a8f2cce3c2cf32a88ce81c666" +PV = "1.6.0+git${SRCPV}" # patch to disable timeout because timeout are not available with actual version # of core-utils @@ -19,7 +23,7 @@ SRC_URI += "file://netdata.service" S = "${WORKDIR}/git" -DEPENDS += "zlib" +DEPENDS += "zlib util-linux" inherit pkgconfig autotools useradd systemd -- cgit 1.2.3-korg