Skip to contentSkip to conversation

netdata: fix whitespace in the patch that caused failures when applying

PATCH New Derek Straka 1 participant 2 messages Apr 29, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 netdata: fix whitespace in the patch that caused failures when applying

---
 .../netdata/netdata/0001-Correct-Timeout-issue.patch              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch +4 -4
index f5342c3..d5529a2 100644
@@ -7,12 +7,12 @@ index 40c0356..bca57b3 100755
  # 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
++#	then
++#	require_cmd timeout || exit 1
 +#fi
 
  # -----------------------------------------------------------------------------
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/2 netdata: replace deprecated 'base_contains' with 'bb.utils.contains'

---
 meta-webserver/recipes-webadmin/netdata/netdata_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-webserver/recipes-webadmin/netdata/netdata_git.bb +1 -1
index 88e3692..317ddcc 100644
@@ -33,7 +33,7 @@ do_install_append() {
     #set S UID for plugins
     chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin
 
-    if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         # Install systemd unit files
         install -d ${D}${systemd_unitdir}/system
         install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system
Signature · 1 line
1.9.1