Changeset 13304


Ignore:
Timestamp:
2008-11-21T00:20:35+01:00 (8 years ago)
Author:
jow
Message:

package/utils/collectd:

  • fix compilation (detection of libxml2 fails because it's not linked against zlib during configure stage)
  • prepare support for sensors and nut plugin, needs work and is marked as broken atm
  • add build dependencies
  • bump package revision
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/collectd/Makefile

    r13237 r13304  
    1111PKG_NAME:=collectd 
    1212PKG_VERSION:=4.4.4 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    1818 
    1919PKG_FIXUP=libtool 
     20PKG_BUILD_DEPENDS:=+libxml2 +libnetsnmp +libcurl +librrd1 
    2021 
    2122include $(INCLUDE_DIR)/package.mk 
     
    173174endef 
    174175 
     176define Package/collectd-mod-nut 
     177        $(call Package/collectd/common_info) 
     178        TITLE:=collectd - UPS monitoring input plugin 
     179        DEPENDS:=collectd @BROKEN 
     180endef 
     181 
    175182define Package/collectd-mod-ping 
    176183        $(call Package/collectd/common_info) 
     
    196203        TITLE:=collectd - rrdtool 1.0.x output plugin 
    197204        DEPENDS:=collectd +librrd1 
     205endef 
     206 
     207define Package/collectd-mod-sensors 
     208        $(call Package/collectd/common_info) 
     209        TITLE:=collectd - lm_sensors input plugin 
     210        DEPENDS:=collectd +libsensors @BROKEN 
    198211endef 
    199212 
     
    272285# list of permanently disabled plugins 
    273286disabled_plugins := apple_sensors battery cpufreq entropy hddtemp ipmi ipvs libvirt mbmon memcached \ 
    274                         multimeter mysql nfs nut perl sensors serial swap tape uuid vserver xmms 
     287                        multimeter mysql nfs perl serial swap tape uuid vserver xmms 
    275288 
    276289# list of selectable plugins 
    277290selectable_plugins := apache apcups ascent cpu csv df disk dns email exec interface iptables irq load \ 
    278                         logfile memory netlink network nginx ntpd ping powerdns processes snmp \ 
    279                         syslog tail tcpconns teamspeak2 unixsock users vmem wireless 
     291                        logfile memory netlink network nginx ntpd nut ping powerdns processes sensors \ 
     292                        snmp syslog tail tcpconns teamspeak2 unixsock users vmem wireless 
    280293 
    281294# makro to enable / disable plugin 
     
    302315ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool1),) 
    303316        PKG_CONFIGURE_OPTS += --with-rrdtool=$(wildcard $(BUILD_DIR)/rrdtool-1.0.*) 
    304         TARGET_LDFLAGS := -L$(wildcard $(BUILD_DIR)/rrdtool-1.0.*)/src/.libs $(TARGET_LDFLAGS) 
     317        TARGET_LDFLAGS := -L$(wildcard $(BUILD_DIR)/rrdtool-1.0.*)/src/.libs -lz $(TARGET_LDFLAGS) 
    305318endif 
    306319 
     
    416429endef 
    417430 
     431define Package/collectd-mod-nut/install 
     432        $(INSTALL_DIR) $(1)/usr/lib/collectd 
     433        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/nut.so $(1)/usr/lib/collectd/ 
     434endef 
     435 
    418436define Package/collectd-mod-ping/install 
    419437        $(INSTALL_DIR) $(1)/usr/lib/collectd 
     
    434452        $(INSTALL_DIR) $(1)/usr/lib/collectd 
    435453        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/rrdtool.so $(1)/usr/lib/collectd/ 
     454endef 
     455 
     456define Package/collectd-mod-sensors/install 
     457        $(INSTALL_DIR) $(1)/usr/lib/collectd 
     458        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/sensors.so $(1)/usr/lib/collectd/ 
    436459endef 
    437460 
     
    502525$(eval $(call BuildPackage,collectd-mod-nginx)) 
    503526$(eval $(call BuildPackage,collectd-mod-ntpd)) 
     527$(eval $(call BuildPackage,collectd-mod-nut)) 
    504528$(eval $(call BuildPackage,collectd-mod-ping)) 
    505529$(eval $(call BuildPackage,collectd-mod-powerdns)) 
    506530$(eval $(call BuildPackage,collectd-mod-processes)) 
    507531$(eval $(call BuildPackage,collectd-mod-rrdtool1)) 
     532$(eval $(call BuildPackage,collectd-mod-sensors)) 
    508533$(eval $(call BuildPackage,collectd-mod-snmp)) 
    509534$(eval $(call BuildPackage,collectd-mod-syslog)) 
Note: See TracChangeset for help on using the changeset viewer.