Merge pull request #297 from remakeelectric/1407-collectd-modbus

Restore libmodbus and remove broken modbus collectd plugin

diff --git a/libs/libmodbus/Makefile b/libs/libmodbus/Makefile
index 159cce9889350e553482799ef340c19daeb1f72b..f8caab357de1bd977a8bd1fec2c16d816a2f029b 100644 (file)
--- a/libs/libmodbus/Makefile
+++ b/libs/libmodbus/Makefile
@@ -8,14 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmodbus
-PKG_VERSION:=2.0.4
+PKG_VERSION:=3.0.6
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/stephane/libmodbus.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5881e70bc99a59fdb3466180e6eb1524b491d09d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://libmodbus.org/releases
+PKG_MD5SUM:=c80f88b6ca19cabc4ceffc195ca07771
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -41,8 +39,8 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/modbus $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.{so*,la} $(1)/usr/lib/
-       # $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       # $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmodbus.pc $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmodbus.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libmodbus/install

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 737cb55e351589ab97f60b53ddf1a5f9b81a9677..240e89ed629d76f97f6fc608bfc37e2f24b5c74b 100644 (file)
--- 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))