projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
20f9ff7
)
collectd: add mod-memory (patch from #5591)
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 4 Oct 2009 03:55:36 +0000
(
03:55
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 4 Oct 2009 03:55:36 +0000
(
03:55
+0000)
SVN-Revision: 17847
utils/collectd/Makefile
patch
|
blob
|
history
utils/collectd/patches/010-rrdtool-link-zlib.patch
patch
|
blob
|
history
utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
patch
|
blob
|
history
diff --git
a/utils/collectd/Makefile
b/utils/collectd/Makefile
index 9b81a633738ece8bbe06a5fe7dc48a7cac65dae4..826f41816bd0249c68756761f34ff78b83637eb3 100644
(file)
--- a/
utils/collectd/Makefile
+++ b/
utils/collectd/Makefile
@@
-9,7
+9,7
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=collectd
PKG_VERSION:=4.4.4
PKG_NAME:=collectd
PKG_VERSION:=4.4.4
-PKG_RELEASE:=
2
+PKG_RELEASE:=
3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/
@@
-28,7
+28,7
@@
define Package/collectd/common_info
endef
define Package/collectd/description
endef
define Package/collectd/description
- collectd is a small daemon which collects system information periodically
+ collectd is a small daemon which collects system information periodically
and provides mechanismns to store the values in a variety of ways.
endef
and provides mechanismns to store the values in a variety of ways.
endef
@@
-154,6
+154,12
@@
define Package/collectd-mod-load
DEPENDS:=collectd
endef
DEPENDS:=collectd
endef
+define Package/collectd-mod-memory
+ $(call Package/collectd/common_info)
+ TITLE:=collectd - physical memory usage input plugin
+ DEPENDS:=collectd
+endef
+
define Package/collectd-mod-netlink
$(call Package/collectd/common_info)
TITLE:=collectd - netlink input plugin (uses iproute2)
define Package/collectd-mod-netlink
$(call Package/collectd/common_info)
TITLE:=collectd - netlink input plugin (uses iproute2)
@@
-252,8
+258,8
@@
define Package/collectd-mod-wireless
endef
endef
-define Package/collectd/conffiles
-/etc/collectd.conf
+define Package/collectd/conffiles
+/etc/collectd.conf
endef
define Build/Configure
endef
define Build/Configure
@@
-409,6
+415,11
@@
define Package/collectd-mod-logfile/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/logfile.so $(1)/usr/lib/collectd/
endef
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/logfile.so $(1)/usr/lib/collectd/
endef
+define Package/collectd-mod-memory/install
+ $(INSTALL_DIR) $(1)/usr/lib/collectd
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/memory.so $(1)/usr/lib/collectd/
+endef
+
define Package/collectd-mod-netlink/install
$(INSTALL_DIR) $(1)/usr/lib/collectd
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/netlink.so $(1)/usr/lib/collectd/
define Package/collectd-mod-netlink/install
$(INSTALL_DIR) $(1)/usr/lib/collectd
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/netlink.so $(1)/usr/lib/collectd/
@@
-521,6
+532,7
@@
$(eval $(call BuildPackage,collectd-mod-iptables))
$(eval $(call BuildPackage,collectd-mod-irq))
$(eval $(call BuildPackage,collectd-mod-load))
$(eval $(call BuildPackage,collectd-mod-logfile))
$(eval $(call BuildPackage,collectd-mod-irq))
$(eval $(call BuildPackage,collectd-mod-load))
$(eval $(call BuildPackage,collectd-mod-logfile))
+$(eval $(call BuildPackage,collectd-mod-memory))
$(eval $(call BuildPackage,collectd-mod-netlink))
$(eval $(call BuildPackage,collectd-mod-network))
$(eval $(call BuildPackage,collectd-mod-nginx))
$(eval $(call BuildPackage,collectd-mod-netlink))
$(eval $(call BuildPackage,collectd-mod-network))
$(eval $(call BuildPackage,collectd-mod-nginx))
diff --git
a/utils/collectd/patches/010-rrdtool-link-zlib.patch
b/utils/collectd/patches/010-rrdtool-link-zlib.patch
index aa3b0b6bb57403a02b91a8544c38e0e5b75149c7..b10af46cf21fbfb6b3eb95d2cbe56ff5db9475c9 100644
(file)
--- a/
utils/collectd/patches/010-rrdtool-link-zlib.patch
+++ b/
utils/collectd/patches/010-rrdtool-link-zlib.patch
@@
-1,8
+1,6
@@
-Index: collectd-4.4.3/configure
-===================================================================
---- collectd-4.4.3.orig/configure 2008-09-08 11:14:03.000000000 +0200
-+++ collectd-4.4.3/configure 2008-09-08 11:14:21.000000000 +0200
-@@ -31446,7 +31446,7 @@
+--- a/configure
++++ b/configure
+@@ -31446,7 +31446,7 @@ if test "${with_rrdtool+set}" = set; the
withval=$with_rrdtool; if test "x$withval" != "xno" && test "x$withval" != "xyes"
then
librrd_cflags="-I$withval/include"
withval=$with_rrdtool; if test "x$withval" != "xno" && test "x$withval" != "xyes"
then
librrd_cflags="-I$withval/include"
diff --git
a/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
b/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
index 23c7861cdee8d56f843624dbc2ec6d7c0baca3cb..dd0bb42be756e0e1a68c00fe2f4e9c1dbd738c72 100644
(file)
--- a/
utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
+++ b/
utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
@@
-1,8
+1,6
@@
-Index: collectd-4.4.2/src/rrdtool.c
-===================================================================
---- collectd-4.4.2.orig/src/rrdtool.c 2008-07-17 19:30:00.000000000 +0200
-+++ collectd-4.4.2/src/rrdtool.c 2008-07-17 19:30:44.000000000 +0200
-@@ -87,6 +87,7 @@
+--- a/src/rrdtool.c
++++ b/src/rrdtool.c
+@@ -87,6 +87,7 @@ static const char *config_keys[] =
"HeartBeat",
"RRARows",
"RRATimespan",
"HeartBeat",
"RRARows",
"RRATimespan",
@@
-10,7
+8,7
@@
Index: collectd-4.4.2/src/rrdtool.c
"XFF"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
"XFF"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-@@ -1077,6 +1078,14 @@
+@@ -1077,6 +1078,14 @@
static int rrd_config (const char *key,
}
xff = tmp;
}
}
xff = tmp;
}