Changeset 19154


Ignore:
Timestamp:
2010-01-15T22:58:28+01:00 (8 years ago)
Author:
swalker
Message:

[packages] collectd: lazily evaluate CONFIGURE_PLUGIN (thanks nbd) (#6447), update to 4.9.1

Location:
packages/utils/collectd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/collectd/Makefile

    r18890 r19154  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=collectd 
    11 PKG_VERSION:=4.9.0 
     11PKG_VERSION:=4.9.1 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://collectd.org/files/ 
    16 PKG_MD5SUM:=5b2e5f57716f2485a3b4eb57774a3818 
     16PKG_MD5SUM:=5753496651c8c84afaea1fe290876bfc 
    1717 
    1818PKG_FIXUP:=libtool 
     19PKG_INSTALL:=1 
    1920 
    2021COLLECTD_PLUGINS_DISABLED:= \ 
     
    148149        KERNEL_DIR="$(LINUX_DIR)" \ 
    149150 
    150 CONFIGURE_PLUGIN:= \ 
     151CONFIGURE_PLUGIN= \ 
    151152        $(foreach m, $(1), \ 
    152153                $(if $(CONFIG_PACKAGE_collectd-mod-$(m)),--enable-$(m),--disable-$(m)) \ 
     
    177178  CONFIGURE_ARGS+= --with-librrd="$(STAGING_DIR)/usr/lib/rrdtool-1.0" 
    178179endif 
    179  
    180 MAKE_FLAGS += \ 
    181         DESTDIR="$(PKG_INSTALL_DIR)" \ 
    182         all install 
    183180 
    184181define Package/collectd/conffiles 
  • packages/utils/collectd/files/collectd.conf

    r18890 r19154  
    7272#<Plugin ping> 
    7373#       Host "host.foo.bar" 
     74#       Interval 1.0 
     75#       Timeout 0.9 
    7476#       TTL 255 
     77#       SourceAddress "1.2.3.4" 
     78#       Device "eth0" 
     79#       MaxMissed -1 
    7580#</Plugin> 
    7681 
  • packages/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch

    r18890 r19154  
    1818        /* consolidation_functions_num = */ 0 
    1919 }; 
    20 @@ -975,6 +978,14 @@ static int rrd_config (const char *key,  
     20@@ -976,6 +979,14 @@ static int rrd_config (const char *key,  
    2121  
    2222                free (value_copy); 
Note: See TracChangeset for help on using the changeset viewer.