From fb0996711efee593980b58cde65ae30268578c97 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Thu, 26 Mar 2020 18:44:42 +0200 Subject: [PATCH] collectd: disable onewire plugin, BROKEN since 2009 Mark the onewire plugin as disabled, as the plugin has been marked BROKEN since it was introduced in 2009 by https://git.openwrt.org/?p=openwrt/svn-archive/packages.git;a=commitdiff;h=0de38b88d6ba8c52b8386d3059baba7dca22961f Signed-off-by: Hannu Nyman (cherry picked from commit 286557e906613757e4b903a8aa4b734682aec85d) --- utils/collectd/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 58902a765..edf398f1d 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -79,6 +79,7 @@ COLLECTD_PLUGINS_DISABLED:= \ notify_email \ notify_nagios \ numa \ + onewire \ openldap \ openvz \ oracle \ @@ -170,7 +171,6 @@ COLLECTD_PLUGINS_SELECTED:= \ ntpd \ nut \ olsrd \ - onewire \ openvpn \ ping \ postgresql \ @@ -306,11 +306,6 @@ ifneq ($(CONFIG_PACKAGE_collectd-mod-modbus),) CONFIGURE_ARGS+= --with-libmodbus="$(STAGING_DIR)/usr" endif -# exception: mod-onewire needs libow-capi -ifneq ($(CONFIG_PACKAGE_collectd-mod-onewire),) - CONFIGURE_ARGS+= --with-libowcapi="$(STAGING_DIR)/usr" -endif - # exception: mod-rrdtool needs rrdtool-1.0.x ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool),) CONFIGURE_ARGS+= --with-librrd="$(STAGING_DIR)/usr/lib/rrdtool-1.0" @@ -413,7 +408,6 @@ $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-n $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,)) $(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut-common)) $(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,)) -$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN)) $(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,)) $(eval $(call BuildPlugin,ping,ping status input,ping,+PACKAGE_collectd-mod-ping:liboping)) $(eval $(call BuildPlugin,postgresql,PostgreSQL status input,postgresql,+PACKAGE_collectd-mod-postgresql:libpq))