From c461550fbbe14e7c75c3cbbbf5b5da0374af65a6 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Mon, 8 Sep 2014 14:51:15 +0000 Subject: [PATCH 1/2] Revert "libmodbus: revert to 2.0.4 to unbreak collectd support" This reverts commit 98d5c3a15acb46ffa557afbda30f2760ad66168c. If collectd wants to stay on their own very outdated v4.10.x, that's fine, but they should not drag other packages down around with them. Support for modern versions of libmodbus has existed in collectd since v5.0.0, released 2011-03-28, so the actively maintained version of libmodbus in OpenWrt's modern package feed should remain at the modern versions in use by third party applications. This restores libmodbus to the existing version used throughout AA and BB prior to this collectd "fix" Signed-off-by: Karl Palsson --- libs/libmodbus/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libs/libmodbus/Makefile b/libs/libmodbus/Makefile index 159cce9889..f8caab357d 100644 --- 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 From 7059d9e50079722abf446dd310ff235dfc04e1a6 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Tue, 9 Sep 2014 10:09:19 +0000 Subject: [PATCH 2/2] 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 --- utils/collectd/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 737cb55e35..240e89ed62 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))