From 44fdca3131e29946068b30becca410a3ccf39ae3 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 26 May 2008 19:51:00 +0000 Subject: [PATCH] [packages] utils/collectd: Build fixes 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 SVN-Revision: 11270 --- utils/collectd/Makefile | 5 ++++ .../patches/010-rrdtool-link-zlib.patch | 11 +++++++++ .../patches/200-wireless-brcm2.4-compat.patch | 24 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 utils/collectd/patches/010-rrdtool-link-zlib.patch create mode 100644 utils/collectd/patches/200-wireless-brcm2.4-compat.patch diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 571eb96a77..69dada1461 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -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 diff --git a/utils/collectd/patches/010-rrdtool-link-zlib.patch b/utils/collectd/patches/010-rrdtool-link-zlib.patch new file mode 100644 index 0000000000..771f3aedc6 --- /dev/null +++ b/utils/collectd/patches/010-rrdtool-link-zlib.patch @@ -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" diff --git a/utils/collectd/patches/200-wireless-brcm2.4-compat.patch b/utils/collectd/patches/200-wireless-brcm2.4-compat.patch new file mode 100644 index 0000000000..064b75dc8b --- /dev/null +++ b/utils/collectd/patches/200-wireless-brcm2.4-compat.patch @@ -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); -- 2.30.2