bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove definition of collectd-mod-rrdtool as it clashes with collectd-mod-rrdtool1

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@12550 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
cyrus 2008-09-08 10:10:30 +00:00
parent 5c04cde1cc
commit d429799665
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/collectd/Makefile
View File

@ -197,12 +197,6 @@ define Package/collectd-mod-rrdtool1
DEPENDS:=collectd +librrd1 DEPENDS:=collectd +librrd1
endef endef
define Package/collectd-mod-rrdtool
$(call Package/collectd/common_info)
TITLE:=collectd - rrdtool 1.2.x output plugin
DEPENDS:=collectd +librrd
endef
define Package/collectd-mod-snmp define Package/collectd-mod-snmp
$(call Package/collectd/common_info) $(call Package/collectd/common_info)
TITLE:=collectd - snmp input plugin TITLE:=collectd - snmp input plugin
@ -305,13 +299,9 @@ ifneq ($(CONFIG_PACKAGE_collectd-mod-netlink),)
endif endif
# exception: mod-rrdtool(1) needs rrdtool # exception: mod-rrdtool(1) needs rrdtool
ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool1)$(CONFIG_PACKAGE_collectd-mod-rrdtool),) ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool1),)
PKG_CONFIGURE_OPTS += --enable-rrdtool PKG_CONFIGURE_OPTS += --enable-rrdtool
ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool1),) PKG_CONFIGURE_OPTS += --with-rrdtool=$(wildcard $(BUILD_DIR)/rrdtool-1.0.*)
PKG_CONFIGURE_OPTS += --with-rrdtool=$(wildcard $(BUILD_DIR)/rrdtool-1.0.*)
else
PKG_CONFIGURE_OPTS += --with-rrdtool=$(wildcard $(BUILD_DIR)/rrdtool-1.2.*)
endif
endif endif
@ -445,11 +435,6 @@ define Package/collectd-mod-rrdtool1/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/rrdtool.so $(1)/usr/lib/collectd/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/rrdtool.so $(1)/usr/lib/collectd/
endef endef
define Package/collectd-mod-rrdtool/install
$(INSTALL_DIR) $(1)/usr/lib/collectd
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/rrdtool.so $(1)/usr/lib/collectd/
endef
define Package/collectd-mod-snmp/install define Package/collectd-mod-snmp/install
$(INSTALL_DIR) $(1)/usr/lib/collectd $(INSTALL_DIR) $(1)/usr/lib/collectd
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/snmp.so $(1)/usr/lib/collectd/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/snmp.so $(1)/usr/lib/collectd/
@ -520,7 +505,6 @@ $(eval $(call BuildPackage,collectd-mod-ping))
$(eval $(call BuildPackage,collectd-mod-powerdns)) $(eval $(call BuildPackage,collectd-mod-powerdns))
$(eval $(call BuildPackage,collectd-mod-processes)) $(eval $(call BuildPackage,collectd-mod-processes))
$(eval $(call BuildPackage,collectd-mod-rrdtool1)) $(eval $(call BuildPackage,collectd-mod-rrdtool1))
$(eval $(call BuildPackage,collectd-mod-rrdtool))
$(eval $(call BuildPackage,collectd-mod-snmp)) $(eval $(call BuildPackage,collectd-mod-snmp))
$(eval $(call BuildPackage,collectd-mod-syslog)) $(eval $(call BuildPackage,collectd-mod-syslog))
$(eval $(call BuildPackage,collectd-mod-tail)) $(eval $(call BuildPackage,collectd-mod-tail))