Revision: 5477 Author: pebender Date: Mon Sep 14 08:48:57 2009 Log: - Updated lm_sensors fixes.
http://code.google.com/p/minimyth/source/detail?r=5477 Added: /trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.1.1-changeset_5765.patch /trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.1.1-changeset_5769.patch Modified: /trunk/gar-minimyth/script/utils/lm_sensors/Makefile /trunk/gar-minimyth/script/utils/lm_sensors/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.1.1-changeset_5765.patch Mon Sep 14 08:48:57 2009 @@ -0,0 +1,102 @@ +diff -Naur lm_sensors-3.1.1-old/CHANGES lm_sensors-3.1.1-new/CHANGES +--- lm_sensors-3.1.1-old/CHANGES 2009-09-14 08:42:35.000000000 -0700 ++++ lm_sensors-3.1.1-new/CHANGES 2009-09-14 08:43:53.000000000 -0700 +@@ -3,6 +3,7 @@ + + 3.1.1 (2009-06-21) + isadump: Use geteuid instead of getuid so that setuid bit works ++ fancontrol: Check that all referenced sysfs files exist + isaset: Use geteuid instead of getuid so that setuid bit works + libsensors: Don't rely on dirent->dt_type being set + New method to free the memory allocated for chip names +diff -Naur lm_sensors-3.1.1-old/prog/pwm/fancontrol lm_sensors-3.1.1-new/prog/pwm/fancontrol +--- lm_sensors-3.1.1-old/prog/pwm/fancontrol 2009-05-09 04:43:06.000000000 -0700 ++++ lm_sensors-3.1.1-new/prog/pwm/fancontrol 2009-09-14 08:43:53.000000000 -0700 +@@ -152,6 +152,58 @@ + echo + } + ++# Check that all referenced sysfs files exist ++function CheckFiles { ++ local outdated=0 ++ ++ let fcvcount=0 ++ while (( $fcvcount < ${#afcp...@]} )) # go through all pwm outputs ++ do ++ pwmo=${AFCPWM[$fcvcount]} ++ if [ ! -w $pwmo ] ++ then ++ echo "Error: file $pwmo doesn't exist" ++ outdated=1 ++ fi ++ let fcvcount=$fcvcount+1 ++ done ++ ++ let fcvcount=0 ++ while (( $fcvcount < ${#afcte...@]} )) # go through all temp inputs ++ do ++ tsen=${AFCTEMP[$fcvcount]} ++ if [ ! -r $tsen ] ++ then ++ echo "Error: file $tsen doesn't exist" ++ outdated=1 ++ fi ++ let fcvcount=$fcvcount+1 ++ done ++ ++ let fcvcount=0 ++ while (( $fcvcount < ${#afcf...@]} )) # go through all fan inputs ++ do ++ fan=${AFCFAN[$fcvcount]} ++ if [ ! -r $fan ] ++ then ++ echo "Error: file $fan doesn't exist" ++ outdated=1 ++ fi ++ let fcvcount=$fcvcount+1 ++ done ++ ++ if [ $outdated -eq 1 ] ++ then ++ echo ++ echo "At least one referenced file is missing. Either some" ++ echo "required kernel modules haven't been loaded, or your" ++ echo "configuration file is outdated. In the latter case," ++ echo "you should run pwmconfig again." ++ fi ++ ++ return $outdated ++} ++ + if [ -f "$1" ] + then + LoadConfig $1 +@@ -177,6 +229,8 @@ + fi + cd $DIR + ++CheckFiles || exit 1 ++ + if [ -f "$PIDFILE" ] + then + echo "File $PIDFILE exists, is fancontrol already running?" +diff -Naur lm_sensors-3.1.1-old/prog/pwm/fancontrol.8 lm_sensors-3.1.1-new/prog/pwm/fancontrol.8 +--- lm_sensors-3.1.1-old/prog/pwm/fancontrol.8 2009-05-09 04:43:06.000000000 -0700 ++++ lm_sensors-3.1.1-new/prog/pwm/fancontrol.8 2009-09-14 08:43:53.000000000 -0700 +@@ -1,4 +1,4 @@ +-.TH FANCONTROL 8 "January 2009" "lm-sensors 3" ++.TH FANCONTROL 8 "September 2009" "lm-sensors 3" + .SH NAME + fancontrol \- automated software based fan speed regulation + +@@ -92,6 +92,10 @@ + setup I recommend using the \fBpwmconfig\fP script. Small changes can be made by + editing the config file directly following the rules above. + ++Upon starting, fancontrol will make sure that all referenced sysfs files ++do exist. If not, it will quit immediately, upon the assumption that the ++configuration file may be out-of-sync with the loaded kernel drivers. ++ + .SH THE ALGORITHM + + \fBfancontrol\fP first reads its configuration, writes it to arrays and loops its ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/lm_sensors/files/lm_sensors-3.1.1-changeset_5769.patch Mon Sep 14 08:48:57 2009 @@ -0,0 +1,39 @@ +diff -Naur lm_sensors-3.1.1-old/CHANGES lm_sensors-3.1.1-new/CHANGES +--- lm_sensors-3.1.1-old/CHANGES 2009-09-14 08:43:53.000000000 -0700 ++++ lm_sensors-3.1.1-new/CHANGES 2009-09-14 08:46:07.000000000 -0700 +@@ -13,6 +13,8 @@ + fancontrol: Add support for absolute path to hwmon devices + sensord: Remove the hidden commandline interface + Introduce struct sensord_arguments ++ Drop AMD K10 detection (unreliable sensors) ++ Add detection for AMD Family 11h thermal sensors + Using sigaction for signal handlers + Convert to linux coding style + Cleanup and refactoring of the source code +diff -Naur lm_sensors-3.1.1-old/prog/detect/sensors-detect lm_sensors-3.1.1-new/prog/detect/sensors-detect +--- lm_sensors-3.1.1-old/prog/detect/sensors-detect 2009-09-14 08:42:41.000000000 -0700 ++++ lm_sensors-3.1.1-new/prog/detect/sensors-detect 2009-09-14 08:46:07.000000000 -0700 +@@ -1828,9 +1828,9 @@ + driver => "k8temp", + detect => \&k8temp_pci_detect, + }, { +- name => "AMD K10 thermal sensors", ++ name => "AMD Family 11h thermal sensors", + driver => "to-be-written", +- detect => \&k10temp_pci_detect, ++ detect => \&fam11h_pci_detect, + }, { + name => "Intel Core family thermal sensor", + driver => "coretemp", +@@ -5201,9 +5201,9 @@ + return 9; + } + +-sub k10temp_pci_detect ++sub fam11h_pci_detect + { +- return unless exists $pci_list{'1022:1203'}; ++ return unless exists $pci_list{'1022:1303'}; + return 9; + } + ======================================= --- /trunk/gar-minimyth/script/utils/lm_sensors/Makefile Tue Jul 21 18:06:39 2009 +++ /trunk/gar-minimyth/script/utils/lm_sensors/Makefile Mon Sep 14 08:48:57 2009 @@ -5,7 +5,9 @@ MASTER_SITES += svn://lm-sensors.org/svn/lm-sensors/trunk/ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = \ - $(DISTNAME)-changeset_5757.patch + $(DISTNAME)-changeset_5757.patch \ + $(DISTNAME)-changeset_5765.patch \ + $(DISTNAME)-changeset_5769.patch PATCHFILES += $(DISTNAME)-perl.patch.gar LICENSE = GPL2 ======================================= --- /trunk/gar-minimyth/script/utils/lm_sensors/checksums Tue Jul 21 18:06:39 2009 +++ /trunk/gar-minimyth/script/utils/lm_sensors/checksums Mon Sep 14 08:48:57 2009 @@ -1,3 +1,5 @@ 613d7cfa23b70c0abae3fabb0a72ff5f download/lm_sensors-3.1.1.tar.bz2 4d4a8377d90307bbe1562464bba2dd99 download/lm_sensors-3.1.1-changeset_5757.patch +b54aa411050d6a331fa0cae78e3d2991 download/lm_sensors-3.1.1-changeset_5765.patch +8bc8e96a53395fa2211502061ca29656 download/lm_sensors-3.1.1-changeset_5769.patch fbae4162ec2549246d86452de2f0ac11 download/lm_sensors-3.1.1-perl.patch.gar --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
