From 5cb2b2fb15e25be2008439920ababc99dcb1436c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 18 Dec 2007 10:19:41 +0000 Subject: [PATCH] - Fix sensors.conf errors with certain chips (patch send in by upstream) --- lm_sensors-3.0.0-sensors.conf.patch | 35 +++++++++++++++++++++++++++++ lm_sensors.spec | 7 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 lm_sensors-3.0.0-sensors.conf.patch diff --git a/lm_sensors-3.0.0-sensors.conf.patch b/lm_sensors-3.0.0-sensors.conf.patch new file mode 100644 index 0000000..8727566 --- /dev/null +++ b/lm_sensors-3.0.0-sensors.conf.patch @@ -0,0 +1,35 @@ +--- lm-sensors-3.0.0/etc/sensors.conf.eg (revision 4980) ++++ lm-sensors-3.0.0/etc/sensors.conf.eg (revision 5076) +@@ -938,5 +938,5 @@ + + compute in2 (197/47)*@ , @/(197/47) +- compute in4 (5*@)-(4*in0) , (@+4*in0)/5 ++ compute in4 (5*@)-(4*in0_input) , (@+4*in0_input)/5 + + # set in0_min 4.8 +@@ -988,6 +988,6 @@ + compute in3 (2.8/1.9) * @, @ * 1.9/2.8 + compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1) +- compute in5 (160/35.7)*(@ - in0) + @, (@ + in0 * 160/35.7)/ (1 + 160/35.7) +- compute in6 (36/16.2)*(@ - in0) + @, (@ + in0 * 36/16.2) / (1 + 36/16.2) ++ compute in5 (160/35.7)*(@ - in0_input) + @, (@ + in0_input * 160/35.7)/ (1 + 160/35.7) ++ compute in6 (36/16.2)*(@ - in0_input) + @, (@ + in0_input * 36/16.2) / (1 + 36/16.2) + + # set in0_min 5 * 0.95 +@@ -2065,10 +2065,10 @@ + # default). If not, use 3.3 instead, but you lose accuracy. + +- compute temp4 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \ +- in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) +- compute temp5 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \ +- in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) +- compute temp6 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \ +- in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) ++ compute temp4 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \ ++ in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) ++ compute temp5 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \ ++ in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) ++ compute temp6 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \ ++ in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15)))) + + # set temp4_min 0 diff --git a/lm_sensors.spec b/lm_sensors.spec index f3d9112..129cc3f 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,6 +1,6 @@ Name: lm_sensors Version: 3.0.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 Source1: lm_sensors.sysconfig @@ -9,6 +9,7 @@ Source2: sensord.sysconfig Source3: sensord.init Patch0: lm_sensors-2.10.4-service-default-off.patch Patch1: lm_sensors-3.0.0-sensord.patch +Patch2: lm_sensors-3.0.0-sensors.conf.patch Summary: Hardware monitoring tools Group: Applications/System License: GPLv2+ @@ -52,6 +53,7 @@ database, and warns of sensor alarms. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -165,6 +167,9 @@ fi %changelog +* Tue Dec 18 2007 Hans de Goede 3.0.0-3 +- Fix sensors.conf errors with certain chips (patch send in by upstream) + * Thu Dec 13 2007 Hans de Goede 3.0.0-2 - Fix sensord rdd mode (patch send in by upstream)