CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

netdata: upgrade 1.17.0 -> 1.22.1

Browse Source 
* 0001-Correct-timeout-issue.patch: timeout is build by coreutils
* 0002-Makefiles-does-not-build-contrib-dir.patch: Upstream added identical

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller 2020-06-19 13:31:55 +02:00 committed by Khem Raj
parent cbbdf91509
commit 09e925dd7b
3 changed files with 4 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch
View File

@ -1,42 +0,0 @@
From ccaf4225239c3092a51cf44f2ab0a2141b8a5fa6 Mon Sep 17 00:00:00 2001
From: Luca Palano <github@lpzone.it>
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 <github@lpzone.it>
---
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)

24
meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch
View File

@ -1,24 +0,0 @@
From 95e1da77de80e38068bb2739faeaad49105700cf Mon Sep 17 00:00:00 2001
From: Luca Palano <github@lpzone.it>
Date: Mon, 15 Jul 2019 10:16:32 +0200
Subject: [PATCH 2/2] Makefiles does not build contrib
Signed-off-by: Luca Palano <github@lpzone.it>
---
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)

15
meta-webserver/recipes-webadmin/netdata/netdata_git.bb
View File

@ -3,15 +3,9 @@ SUMMARY = "Real-time performance monitoring"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \
file://0002-Makefiles-does-not-build-contrib-dir.patch \
"
SRCREV = "588ce5a7b18999dfa66698cd3a2f005f7a3c31cf"
PV = "1.17.0"
# 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 = "git://github.com/firehol/netdata.git;protocol=https"
SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766"
PV = "1.22.1"
# default netdata.conf for netdata configuration
SRC_URI += "file://netdata.conf"
@ -21,7 +15,7 @@ SRC_URI += "file://netdata.service"
S = "${WORKDIR}/git"
DEPENDS += "zlib util-linux"
DEPENDS += "zlib util-linux libuv"
inherit pkgconfig autotools-brokensep useradd systemd
@ -58,5 +52,4 @@ do_install_append() {
sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf
}
FILES_${PN}-dbg += "${libexecdir}/netdata/plugins.d/.debug"
RDEPENDS_${PN} = "bash zlib"