Author: pebender
Date: Mon Jan 12 18:28:59 2009
New Revision: 4235
Added:
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5473.patch
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5580.patch
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5581.patch
Modified:
trunk/gar-minimyth/script/utils/lm_sensors/Makefile
trunk/gar-minimyth/script/utils/lm_sensors/checksums
Log:
- Updated utils/lm_sensors fixes.
Modified: trunk/gar-minimyth/script/utils/lm_sensors/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/lm_sensors/Makefile (original)
+++ trunk/gar-minimyth/script/utils/lm_sensors/Makefile Mon Jan 12 18:28:59
2009
@@ -6,7 +6,10 @@
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = \
$(DISTNAME)-changeset_5352.patch \
- $(DISTNAME)-changeset_5366.patch
+ $(DISTNAME)-changeset_5366.patch \
+ $(DISTNAME)-changeset_5473.patch \
+ $(DISTNAME)-changeset_5580.patch \
+ $(DISTNAME)-changeset_5581.patch
PATCHFILES += $(DISTNAME)-perl.patch.gar
LICENSE = GPL2
Modified: trunk/gar-minimyth/script/utils/lm_sensors/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/lm_sensors/checksums (original)
+++ trunk/gar-minimyth/script/utils/lm_sensors/checksums Mon Jan 12
18:28:59 2009
@@ -1,4 +1,7 @@
e88b236228ac2a50821217015b8fd0fa download/lm_sensors-3.0.3.tar.bz2
6b9ea25ab25e7d15793193580b3fe5a9
download/lm_sensors-3.0.3-changeset_5352.patch
8037abd9df1c802b581919918c288de3
download/lm_sensors-3.0.3-changeset_5366.patch
+d04bd32ececa6d6a540df5d6685e0469
download/lm_sensors-3.0.3-changeset_5473.patch
+7eb7e818ca3352f844d7c960eb8d6a00
download/lm_sensors-3.0.3-changeset_5580.patch
+3f2471b7ab53268742813b249315b1c6
download/lm_sensors-3.0.3-changeset_5581.patch
f49706aa8d881acb84fdc4fc3fda9636 download/lm_sensors-3.0.3-perl.patch.gar
Added:
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5473.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5473.patch
Mon Jan 12 18:28:59 2009
@@ -0,0 +1,23 @@
+diff -Naur lm_sensors-3.0.3-old/CHANGES lm_sensors-3.0.3-new/CHANGES
+--- lm_sensors-3.0.3-old/CHANGES 2009-01-12 18:10:22.000000000 -0800
++++ lm_sensors-3.0.3-new/CHANGES 2009-01-12 18:12:06.000000000 -0800
+@@ -5,6 +5,7 @@
+ libsensors: Avoid namespace pollution
+ sensors-detect: Fix detection of ADT7463 and LM96000
+ fancontrol: Don't use named pipes when we don't need them (#2319)
++ sensord: Accept negative temperatures in RRD database
+ Fix detection of Intel 5000 series FB-DIMM AMB
+ pwmconfig: Tell the user about gnuplot if it isn't installed
+ Fix MINSTOP and MINSTART test functions
+diff -Naur lm_sensors-3.0.3-old/prog/sensord/rrd.c
lm_sensors-3.0.3-new/prog/sensord/rrd.c
+--- lm_sensors-3.0.3-old/prog/sensord/rrd.c 2009-01-12 18:09:56.000000000
-0800
++++ lm_sensors-3.0.3-new/prog/sensord/rrd.c 2009-01-12 18:12:06.000000000
-0800
+@@ -201,7 +201,7 @@
+ max = "12000";
+ break;
+ case DataType_temperature:
+- min = "0";
++ min = "-100";
+ max = "250";
+ break;
+ default:
Added:
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5580.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5580.patch
Mon Jan 12 18:28:59 2009
@@ -0,0 +1,70 @@
+diff -Naur lm_sensors-3.0.3-old/CHANGES lm_sensors-3.0.3-new/CHANGES
+--- lm_sensors-3.0.3-old/CHANGES 2009-01-12 18:12:06.000000000 -0800
++++ lm_sensors-3.0.3-new/CHANGES 2009-01-12 18:14:32.000000000 -0800
+@@ -6,6 +6,7 @@
+ sensors-detect: Fix detection of ADT7463 and LM96000
+ fancontrol: Don't use named pipes when we don't need them (#2319)
+ sensord: Accept negative temperatures in RRD database
++ Don't bail out on transient errors (#2330)
+ Fix detection of Intel 5000 series FB-DIMM AMB
+ pwmconfig: Tell the user about gnuplot if it isn't installed
+ Fix MINSTOP and MINSTART test functions
+diff -Naur lm_sensors-3.0.3-old/prog/sensord/sensord.c
lm_sensors-3.0.3-new/prog/sensord/sensord.c
+--- lm_sensors-3.0.3-old/prog/sensord/sensord.c 2009-01-12
18:10:42.000000000 -0800
++++ lm_sensors-3.0.3-new/prog/sensord/sensord.c 2009-01-12
18:14:32.000000000 -0800
+@@ -90,29 +90,33 @@
+
+ sensorLog (LOG_INFO, "sensord started");
+
+- while (!done && (ret == 0)) {
++ while (!done) {
+ if (reload) {
+ ret = reloadLib (sensorsCfgFile);
++ if (ret)
++ sensorLog (LOG_NOTICE, "config reload error (%d)", ret);
+ reload = 0;
+ }
+- if ((ret == 0) && scanTime) { /* should I scan on the read cycle? */
+- ret = scanChips ();
+- if (scanValue <= 0)
+- scanValue += scanTime;
++ if (scanTime && (scanValue <= 0)) {
++ if ((ret = scanChips ()))
++ sensorLog (LOG_NOTICE, "sensor scan error (%d)", ret);
++ scanValue += scanTime;
+ }
+- if ((ret == 0) && logTime && (logValue <= 0)) {
+- ret = readChips ();
++ if (logTime && (logValue <= 0)) {
++ if ((ret = readChips ()))
++ sensorLog (LOG_NOTICE, "sensor read error (%d)", ret);
+ logValue += logTime;
+ }
+- if ((ret == 0) && rrdTime && rrdFile && (rrdValue <= 0)) {
+- ret = rrdUpdate ();
++ if (rrdTime && rrdFile && (rrdValue <= 0)) {
++ if ((ret = rrdUpdate ()))
++ sensorLog (LOG_NOTICE, "rrd update error (%d)", ret);
+ /*
+ * The amount of time to wait is computed using the same method as
+ * in RRD instead of simply adding the interval.
+ */
+ rrdValue = rrdTime - time(NULL) % rrdTime;
+ }
+- if (!done && (ret == 0)) {
++ if (!done) {
+ int a = logTime ? logValue : INT_MAX;
+ int b = scanTime ? scanValue : INT_MAX;
+ int c = (rrdTime && rrdFile) ? rrdValue : INT_MAX;
+@@ -124,10 +128,7 @@
+ }
+ }
+
+- if (ret)
+- sensorLog (LOG_INFO, "sensord failed (%d)", ret);
+- else
+- sensorLog (LOG_INFO, "sensord stopped");
++ sensorLog (LOG_INFO, "sensord stopped");
+
+ return ret;
+ }
Added:
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5581.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.0.3-changeset_5581.patch
Mon Jan 12 18:28:59 2009
@@ -0,0 +1,27 @@
+diff -Naur lm_sensors-3.0.3-old/CHANGES lm_sensors-3.0.3-new/CHANGES
+--- lm_sensors-3.0.3-old/CHANGES 2009-01-12 18:14:32.000000000 -0800
++++ lm_sensors-3.0.3-new/CHANGES 2009-01-12 18:15:40.000000000 -0800
+@@ -4,6 +4,7 @@
+ 3.0.3 (2008-09-28)
+ libsensors: Avoid namespace pollution
+ sensors-detect: Fix detection of ADT7463 and LM96000
++ Fix error propagation during expression evaluation
+ fancontrol: Don't use named pipes when we don't need them (#2319)
+ sensord: Accept negative temperatures in RRD database
+ Don't bail out on transient errors (#2330)
+diff -Naur lm_sensors-3.0.3-old/lib/access.c
lm_sensors-3.0.3-new/lib/access.c
+--- lm_sensors-3.0.3-old/lib/access.c 2009-01-12 18:13:21.000000000 -0800
++++ lm_sensors-3.0.3-new/lib/access.c 2009-01-12 18:15:40.000000000 -0800
+@@ -437,10 +437,8 @@
+ if (!(subfeature = sensors_lookup_subfeature_name(chip_features,
+ expr->data.var)))
+ return -SENSORS_ERR_NO_ENTRY;
+- if (!(res = sensors_get_value(&chip_features->chip,
+- subfeature->number, result)))
+- return res;
+- return 0;
++ return sensors_get_value(&chip_features->chip,
++ subfeature->number, result);
+ }
+ if ((res = sensors_eval_expr(chip_features, expr->data.subexpr.sub1,
+ val, &res1)))
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
