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

[packages] utils/collectd: Build fixes

Browse Source 
Fixed Makefile to handle conflicting rrdtool packages
Added missing linking option to zlib for mod-rrdtool
Added compatibility code for brcm2.4 to mod-wireless


git-svn-id: svn://svn.openwrt.org/openwrt/packages@11270 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
cyrus 2008-05-26 19:51:00 +00:00
parent 0d1b85c2d7
commit 7b2e112ad7
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/collectd/Makefile
View File

@ -305,6 +305,11 @@ endif
# exception: mod-rrdtool(1) needs rrdtool
ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool1)$(CONFIG_PACKAGE_collectd-mod-rrdtool),)
PKG_CONFIGURE_OPTS += --enable-rrdtool
ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool1),)
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

11
utils/collectd/patches/010-rrdtool-link-zlib.patch Normal file
View File

@ -0,0 +1,11 @@
--- collectd-4.4.0.orig/configure 2008-05-26 17:54:07.000000000 +0200
+++ collectd-4.4.0/configure 2008-05-26 19:10:23.000000000 +0200
@@ -31551,7 +31551,7 @@
withval=$with_rrdtool; if test "x$withval" != "xno" && test "x$withval" != "xyes"
then
librrd_cflags="-I$withval/include"
- librrd_ldflags="-L$withval/lib"
+ librrd_ldflags="-L$withval/lib -lz"
with_rrdtool="yes"
else
with_rrdtool="$withval"

24
utils/collectd/patches/200-wireless-brcm2.4-compat.patch Normal file
View File

@ -0,0 +1,24 @@
--- collectd-4.4.0.orig/src/wireless.c 2008-05-26 20:13:05.000000000 +0200
+++ collectd-4.4.0/src/wireless.c 2008-05-26 20:15:16.000000000 +0200
@@ -128,7 +128,9 @@
power = 1.0; /* invalid */
else if ((power >= 0.0) && (power <= 100.0))
power = wireless_percent_to_power (power);
- else if (power > 100.0)
+ else if ((power > 100.0) && (power <= 256.0))
+ power = power - 256.0;
+ else
power = 1.0; /* invalid */
/* noise [dBm] < 0.0 */
@@ -137,7 +139,9 @@
noise = 1.0; /* invalid */
else if ((noise >= 0.0) && (noise <= 100.0))
noise = wireless_percent_to_power (noise);
- else if (noise > 100.0)
+ else if ((noise > 100.0) && (noise <= 256.0))
+ noise = noise - 256.0;
+ else
noise = 1.0; /* invalid */
wireless_submit (device, "signal_quality", quality);