diff options
| author | Karl Palsson <karlp@remake.is> | 2014-09-09 10:09:19 +0000 |
|---|---|---|
| committer | Karl Palsson <karlp@remake.is> | 2014-09-09 10:16:09 +0000 |
| commit | 7059d9e50079722abf446dd310ff235dfc04e1a6 (patch) | |
| tree | 68c382bea7de9d2cf2d49d215b3d78f5ff6d050b /utils | |
| parent | c461550fbbe14e7c75c3cbbbf5b5da0374af65a6 (diff) | |
collectd: modbus: Drop failing module that requires old lib
collectd-mod-modbus in collectd versions prior to 5.0.0 require
libmodbus v2.0.x or earlier. libmodbus v2.x is old and outdated, and
OpenWrt's packages feed has contained libmodbus v3.0.x for the entire
lifetime of Attitude Adjustment and most of Barrier Breaker.
Consequently, the collectd-mod-modbus plugin has never actually built
for this time, so rather than downgrading libmodbus, we simply remove
the collectd-mod-modbus plugin.
If collectd moves to version 5+, it gains support for modern versions of
libmodbus, and can be re-added.
Signed-off-by: Karl Palsson <karlp@remake.is>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/collectd/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 737cb55e3..240e89ed6 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -40,6 +40,7 @@ COLLECTD_PLUGINS_DISABLED:= \ mbmon \ memcachec \ memcached \ + modbus \ monitorus \ multimeter \ netapp \ @@ -88,7 +89,6 @@ COLLECTD_PLUGINS_SELECTED:= \ logfile \ madwifi \ memory \ - modbus \ mysql \ netlink \ network \ @@ -194,11 +194,6 @@ ifneq ($(CONFIG_PACKAGE_collectd-mod-netlink),) CONFIGURE_ARGS+= --with-libnetlink="$(STAGING_DIR)/usr" endif -# exception: mod-modbus needs libmodbus -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" @@ -280,7 +275,6 @@ $(eval $(call BuildPlugin,logfile,log files output,logfile,)) $(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,)) #$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r)) $(eval $(call BuildPlugin,memory,physical memory usage input,memory,)) -$(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus)) $(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @BROKEN)) $(eval $(call BuildPlugin,network,network input/output,network)) $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl)) |