diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-13 22:40:08 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-24 18:57:35 +0200 |
commit | aa57c0f3b9707d4f340b2bf43d29b29f88bef50b (patch) | |
tree | 613691d838d25da290137575b2279d3fd0c11180 /meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch | |
parent | 9dfececc96801e2e06d6140848bf21c92db1d2f9 (diff) | |
download | meta-openembedded-contrib-aa57c0f3b9707d4f340b2bf43d29b29f88bef50b.tar.gz |
netdata: Upgrade to 1.6.0
Licence files has gotten cosmetic changes
additionally checksum COPYING file.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch')
-rw-r--r-- | meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch | 32 |
1 files changed, 17 insertions, 15 deletions
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 + |