From c9e4c2719621ebc7d976bb55198a2ded0ba7e708601fe9ba2fb5b51ce890ba2a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 5 Feb 2010 13:20:16 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/sensors revision 50.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=cc08f45d86fd3ddc4cafb4496dd6c844 --- lm_sensors-3.0.0-sysconfig_metadata.patch | 2 +- ...s-3.0.3-hint-at-kernel-extra-package.patch | 4 +- lm_sensors-3.1.1-build.patch | 2 +- lm_sensors-3.1.1-no-ipmisensors-driver.patch | 4 +- lm_sensors-3.1.1.tar.bz2 | 3 - lm_sensors-3.1.1.tar.bz2.sig | Bin 65 -> 0 bytes lm_sensors-3.1.2.tar.bz2 | 3 + lm_sensors-3.1.2.tar.bz2.sig | Bin 0 -> 65 bytes ...ensors-r5757-LPC47M233-not-supported.patch | 16 - lm_sensors-r5760-rename-modprobe-conf.patch | 53 --- lm_sensors-r5770-fancontrol-update.patch | 429 ------------------ sensors.changes | 8 + sensors.spec | 14 +- 13 files changed, 21 insertions(+), 517 deletions(-) delete mode 100644 lm_sensors-3.1.1.tar.bz2 delete mode 100644 lm_sensors-3.1.1.tar.bz2.sig create mode 100644 lm_sensors-3.1.2.tar.bz2 create mode 100644 lm_sensors-3.1.2.tar.bz2.sig delete mode 100644 lm_sensors-r5757-LPC47M233-not-supported.patch delete mode 100644 lm_sensors-r5760-rename-modprobe-conf.patch delete mode 100644 lm_sensors-r5770-fancontrol-update.patch diff --git a/lm_sensors-3.0.0-sysconfig_metadata.patch b/lm_sensors-3.0.0-sysconfig_metadata.patch index fdbcd63..47a3e06 100644 --- a/lm_sensors-3.0.0-sysconfig_metadata.patch +++ b/lm_sensors-3.0.0-sysconfig_metadata.patch @@ -1,6 +1,6 @@ --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.1.1/prog/detect/sensors-detect -@@ -5460,6 +5460,12 @@ sub write_config +@@ -5709,6 +5709,12 @@ sub write_config or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; print SYSCONFIG <<'EOT'; diff --git a/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch b/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch index 8ba022e..a301a7c 100644 --- a/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch +++ b/lm_sensors-3.0.3-hint-at-kernel-extra-package.patch @@ -8,7 +8,7 @@ package if drivers are found to be missing. --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.1.1/prog/detect/sensors-detect -@@ -2052,12 +2052,15 @@ sub initialize_conf +@@ -2129,12 +2129,15 @@ sub initialize_conf # [2] -> SUBLEVEL # [3] -> EXTRAVERSION # @@ -25,7 +25,7 @@ package if drivers are found to be missing. chomp($kernel_arch = `uname -m`); # We only support kernels >= 2.6.5 -@@ -5402,7 +5405,11 @@ sub generate_modprobes +@@ -5651,7 +5654,11 @@ sub generate_modprobes # isn't supported if ((($? >> 8) == 0) && ! $modulefound) { print "Warning: the required module $driver is not currently installed\n". diff --git a/lm_sensors-3.1.1-build.patch b/lm_sensors-3.1.1-build.patch index 0a0af2f..43b8ffb 100644 --- a/lm_sensors-3.1.1-build.patch +++ b/lm_sensors-3.1.1-build.patch @@ -1,6 +1,6 @@ --- lm_sensors-3.1.1.orig/Makefile +++ lm_sensors-3.1.1/Makefile -@@ -140,7 +140,7 @@ ifeq ($(DEBUG),1) +@@ -141,7 +141,7 @@ ifeq ($(DEBUG),1) ALL_CPPFLAGS += -DDEBUG ALL_CFLAGS += -O -g else diff --git a/lm_sensors-3.1.1-no-ipmisensors-driver.patch b/lm_sensors-3.1.1-no-ipmisensors-driver.patch index 06bf618..903503b 100644 --- a/lm_sensors-3.1.1-no-ipmisensors-driver.patch +++ b/lm_sensors-3.1.1-no-ipmisensors-driver.patch @@ -7,7 +7,7 @@ the user to that driver. --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.1.1/prog/detect/sensors-detect -@@ -1121,12 +1121,12 @@ use vars qw(@i2c_adapter_names); +@@ -1166,12 +1166,12 @@ use vars qw(@i2c_adapter_names); @ipmi_ifs = ( { name => "IPMI BMC KCS", @@ -22,7 +22,7 @@ the user to that driver. isa_addrs => [0x0ca8], isa_detect => sub { ipmi_detect(@_); }, } -@@ -5127,13 +5127,13 @@ sub ipmi_from_smbios +@@ -5334,13 +5334,13 @@ sub ipmi_from_smbios $if->{type})); } print "Success!\n". diff --git a/lm_sensors-3.1.1.tar.bz2 b/lm_sensors-3.1.1.tar.bz2 deleted file mode 100644 index aff83f4..0000000 --- a/lm_sensors-3.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d95a3f2a6526f4da2ae145b7bbf45d16f0fb17bfe0d2017c7e02964199d059ef -size 154551 diff --git a/lm_sensors-3.1.1.tar.bz2.sig b/lm_sensors-3.1.1.tar.bz2.sig deleted file mode 100644 index a08a522ea919c6ae60aa93a81f063379ae6eaa5c2f7be60b1c6dc664fb5b329c..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-NW*o diff --git a/lm_sensors-3.1.2.tar.bz2 b/lm_sensors-3.1.2.tar.bz2 new file mode 100644 index 0000000..0516750 --- /dev/null +++ b/lm_sensors-3.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4f9553417f4c6592e87cbcbefb04d5c16710d58fa6fd02ca46a309f3b613d6e +size 157644 diff --git a/lm_sensors-3.1.2.tar.bz2.sig b/lm_sensors-3.1.2.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a1f68a60b0bc27a0ecac3c6002467eea2800c7b53a61a476de401e7ca2c55d81 GIT binary patch literal 65 zcmV-H0KWf-KLZ5-OK6CohE|BsIPfpX5dx{y0G~kILg(~HzH7?773( (1 << 7); - features => FEAT_FAN, - }, { - name => "SMSC LPC47M233 Super IO Sensors", -- driver => "smsc47m1", -+ driver => "to-be-written", - devid => 0x6b80, - devid_mask => 0xff80, - logdev => 0x0a, diff --git a/lm_sensors-r5760-rename-modprobe-conf.patch b/lm_sensors-r5760-rename-modprobe-conf.patch deleted file mode 100644 index fbb1a29..0000000 --- a/lm_sensors-r5760-rename-modprobe-conf.patch +++ /dev/null @@ -1,53 +0,0 @@ -Upstream commit: http://www.lm-sensors.org/changeset/5760 - -Recent versions of module-init-tools only want *.conf files under -/etc/modprobe.d. So rename our configuration file to lm_sensors.conf -there. Also let "make install" rename the file if it already exists. - ---- lm_sensors-3.1.1.orig/Makefile -+++ lm_sensors-3.1.1/Makefile -@@ -118,6 +118,7 @@ SRCDIRS += lib/test - MKDIR := mkdir -p - RMDIR := rmdir - RM := rm -f -+MV := mv -f - BISON := bison - FLEX := flex - AR := ar ---- lm_sensors-3.1.1.orig/etc/Module.mk -+++ lm_sensors-3.1.1/etc/Module.mk -@@ -28,6 +28,10 @@ install-etc: - fi - $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 755 $(ETC_DIR)/sensors-conf-convert $(DESTDIR)$(BINDIR) -+ if [ -e $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors \ -+ -a ! -e $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ] ; then \ -+ $(MV) $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ; \ -+ fi - - user_install :: install-etc - ---- lm_sensors-3.1.1.orig/prog/detect/sensors-detect -+++ lm_sensors-3.1.1/prog/detect/sensors-detect -@@ -5430,8 +5430,8 @@ sub write_config - - if (defined $configfile) { - my $have_modprobe_d = -d '/etc/modprobe.d'; -- printf "Do you want to \%s /etc/modprobe.d/lm_sensors? (\%s): ", -- (-e '/etc/modprobe.d/lm_sensors' ? 'overwrite' : 'generate'), -+ printf "Do you want to \%s /etc/modprobe.d/lm_sensors.conf? (\%s): ", -+ (-e '/etc/modprobe.d/lm_sensors.conf' ? 'overwrite' : 'generate'), - ($have_modprobe_d ? 'YES/no' : 'yes/NO'); - $_ = ; - if (($have_modprobe_d and not m/^\s*n/i) or m/^\s*y/i) { -@@ -5439,8 +5439,8 @@ sub write_config - mkdir('/etc/modprobe.d', 0777) - or die "Sorry, can't create /etc/modprobe.d ($!)"; - } -- open(local *MODPROBE_D, ">/etc/modprobe.d/lm_sensors") -- or die "Sorry, can't create /etc/modprobe.d/lm_sensors ($!)"; -+ open(local *MODPROBE_D, ">/etc/modprobe.d/lm_sensors.conf") -+ or die "Sorry, can't create /etc/modprobe.d/lm_sensors.conf ($!)"; - print MODPROBE_D "# Generated by sensors-detect on " . scalar localtime() . "\n"; - print MODPROBE_D $configfile; - close(MODPROBE_D); diff --git a/lm_sensors-r5770-fancontrol-update.patch b/lm_sensors-r5770-fancontrol-update.patch deleted file mode 100644 index 63f1e43..0000000 --- a/lm_sensors-r5770-fancontrol-update.patch +++ /dev/null @@ -1,429 +0,0 @@ -Make fancontrol more rebust against kernel driver changes -(bnc#529483). - ---- lm_sensors-3.1.1.orig/prog/pwm/fancontrol (révision 5743) -+++ lm_sensors-3.1.1/prog/pwm/fancontrol (copie de travail) -@@ -3,12 +3,12 @@ - # Simple script implementing a temperature dependent fan speed control - # Supported Linux kernel versions: 2.6.5 and later - # --# Version 0.68 -+# Version 0.70 - # - # Usage: fancontrol [CONFIGFILE] - # - # Dependencies: --# bash, egrep, sed, cut, sleep, lm_sensors :) -+# bash, egrep, sed, cut, sleep, readlink, lm_sensors :) - # - # Please send any questions, comments or success stories to - # marius.reiner@hdev.de -@@ -55,6 +55,8 @@ - - # grep configuration from file - INTERVAL=`egrep '^INTERVAL=.*$' $1 | sed -e 's/INTERVAL=//g'` -+ DEVPATH=`egrep '^DEVPATH=.*$' $1 | sed -e 's/DEVPATH= *//g'` -+ DEVNAME=`egrep '^DEVNAME=.*$' $1 | sed -e 's/DEVNAME= *//g'` - FCTEMPS=`egrep '^FCTEMPS=.*$' $1 | sed -e 's/FCTEMPS=//g'` - MINTEMP=`egrep '^MINTEMP=.*$' $1 | sed -e 's/MINTEMP=//g'` - MAXTEMP=`egrep '^MAXTEMP=.*$' $1 | sed -e 's/MAXTEMP=//g'` -@@ -152,6 +154,108 @@ - echo - } - -+function DevicePath() -+{ -+ if [ -h "$1/device" ] -+ then -+ readlink -f "$1/device" | sed -e 's/^\/sys\///' -+ fi -+} -+ -+function DeviceName() -+{ -+ if [ -r "$1/name" ] -+ then -+ cat "$1/name" | sed -e 's/[[:space:]=]/_/g' -+ elif [ -r "$1/device/name" ] -+ then -+ cat "$1/device/name" | sed -e 's/[[:space:]=]/_/g' -+ fi -+} -+ -+function ValidateDevices() -+{ -+ local OLD_DEVPATH="$1" OLD_DEVNAME="$2" outdated=0 -+ local entry device name path -+ -+ for entry in $OLD_DEVPATH -+ do -+ device=`echo "$entry" | sed -e 's/=[^=]*$//'` -+ path=`echo "$entry" | sed -e 's/^[^=]*=//'` -+ -+ if [ "`DevicePath "$device"`" != "$path" ] -+ then -+ echo "Device path of $device has changed" -+ outdated=1 -+ fi -+ done -+ -+ for entry in $OLD_DEVNAME -+ do -+ device=`echo "$entry" | sed -e 's/=[^=]*$//'` -+ name=`echo "$entry" | sed -e 's/^[^=]*=//'` -+ -+ if [ "`DeviceName "$device"`" != "$name" ] -+ then -+ echo "Device name of $device has changed" -+ outdated=1 -+ fi -+ done -+ -+ return $outdated -+} -+ -+# Check that all referenced sysfs files exist -+function CheckFiles { -+ local outdated=0 -+ -+ let fcvcount=0 -+ while (( $fcvcount < ${#AFCPWM[@]} )) # 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 < ${#AFCTEMP[@]} )) # 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 < ${#AFCFAN[@]} )) # 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 required kernel" -+ echo "modules haven't been loaded, or your configuration file is outdated." -+ echo "In the latter case, you should run pwmconfig again." -+ fi -+ -+ return $outdated -+} -+ - if [ -f "$1" ] - then - LoadConfig $1 -@@ -166,8 +270,12 @@ - elif echo "${AFCPWM[0]}" | egrep -q '^hwmon[0-9]' - then - DIR=/sys/class/hwmon -+elif echo "${AFCPWM[0]}" | egrep -q '^[1-9]*[0-9]-[0-9abcdef]{4}' -+then -+ DIR=/sys/bus/i2c/devices - else -- DIR=/sys/bus/i2c/devices -+ echo "$0: Invalid path to sensors" -+ exit 1 - fi - - if [ ! -d $DIR ] -@@ -177,6 +285,19 @@ - fi - cd $DIR - -+# Check for configuration change -+if [ -z "$DEVPATH" -o -z "$DEVNAME" ] -+then -+ echo "Configuration is too old, please run pwmconfig again" -+ exit 1 -+fi -+if ! ValidateDevices "$DEVPATH" "$DEVNAME" -+then -+ echo "Configuration appears to be outdated, please run pwmconfig again" -+ exit 1 -+fi -+CheckFiles || exit 1 -+ - if [ -f "$PIDFILE" ] - then - echo "File $PIDFILE exists, is fancontrol already running?" ---- lm_sensors-3.1.1.orig/prog/pwm/pwmconfig (révision 5743) -+++ lm_sensors-3.1.1/prog/pwm/pwmconfig (copie de travail) -@@ -42,6 +42,12 @@ - exit 1 - fi - -+if [ "`id -u`" != "0" ] -+then -+ echo "You need to be root to run this script." -+ exit 1 -+fi -+ - echo "# pwmconfig revision $REVISION ($REVDATE)" - echo 'This program will search your sensors for pulse width modulation (pwm)' - echo 'controls, and test each one to see if it controls a fan on' -@@ -258,7 +264,7 @@ - GOODPWM="$GOODPWM $i" - fi - else -- NOTROOT=1 -+ echo "Can't write to $i, skipping." - fi - done - -@@ -302,13 +308,6 @@ - exit 1 - fi - --if [ "$NOTROOT" = "1" ] --then -- echo 'As you are not root, we cannot write the PWM settings.' -- echo 'Please run as root to continue.' -- exit 1 --fi -- - echo 'Warning!!! This program will stop your fans, one at a time,' - echo "for approximately $DELAY seconds each!!!" - echo 'This may cause your processor temperature to rise!!!' -@@ -540,6 +539,57 @@ - exit 1 - fi - -+function DevicePath() -+{ -+ if [ -h "$1/device" ] -+ then -+ readlink -f "$1/device" | sed -e 's/^\/sys\///' -+ fi -+} -+ -+function DeviceName() -+{ -+ if [ -r "$1/name" ] -+ then -+ cat "$1/name" | sed -e 's/[[:space:]=]/_/g' -+ elif [ -r "$1/device/name" ] -+ then -+ cat "$1/device/name" | sed -e 's/[[:space:]=]/_/g' -+ fi -+} -+ -+function ValidateDevices() -+{ -+ local OLD_DEVPATH="$1" OLD_DEVNAME="$2" outdated=0 -+ local entry device name path -+ -+ for entry in $OLD_DEVPATH -+ do -+ device=`echo "$entry" | sed -e 's/=[^=]*$//'` -+ path=`echo "$entry" | sed -e 's/^[^=]*=//'` -+ -+ if [ "`DevicePath "$device"`" != "$path" ] -+ then -+ echo "Device path of $device has changed" -+ outdated=1 -+ fi -+ done -+ -+ for entry in $OLD_DEVNAME -+ do -+ device=`echo "$entry" | sed -e 's/=[^=]*$//'` -+ name=`echo "$entry" | sed -e 's/^[^=]*=//'` -+ -+ if [ "`DeviceName "$device"`" != "$name" ] -+ then -+ echo "Device name of $device has changed" -+ outdated=1 -+ fi -+ done -+ -+ return $outdated -+} -+ - function AskPath() - { - echo -n 'What should be the path to your fancontrol config file (/etc/fancontrol)? ' -@@ -567,6 +617,8 @@ - - function LoadConfig() - { -+ local OLD_DEVPATH OLD_DEVNAME -+ - # Nothing to do - if [ ! -f "$1" ] - then -@@ -576,6 +628,8 @@ - - echo "Loading configuration from $1 ..." - INTERVAL=`egrep '^INTERVAL=.*$' $1 | sed -e 's/INTERVAL= *//g'` -+ OLD_DEVPATH=`egrep '^DEVPATH=.*$' $1 | sed -e 's/DEVPATH= *//g'` -+ OLD_DEVNAME=`egrep '^DEVNAME=.*$' $1 | sed -e 's/DEVNAME= *//g'` - FCTEMPS=`egrep '^FCTEMPS=.*$' $1 | sed -e 's/FCTEMPS= *//g'` - FCFANS=`egrep '^FCFANS=.*$' $1 | sed -e 's/FCFANS= *//g'` - MINTEMP=`egrep '^MINTEMP=.*$' $1 | sed -e 's/MINTEMP= *//g'` -@@ -586,16 +640,12 @@ - MAXPWM=`egrep '^MAXPWM=.*$' $1 | sed -e 's/MAXPWM= *//g'` - - # Check for configuration change -- local item -- for item in $FCFANS -- do -- if [ ! -f "`echo $item | sed -e 's/=.*$//'`" ] -- then -- echo "Configuration appears to be outdated, discarded" -- ClearConfig -- return 0 -- fi -- done -+ if ! ValidateDevices "$OLD_DEVPATH" "$OLD_DEVNAME" -+ then -+ echo "Configuration appears to be outdated, discarded" -+ ClearConfig -+ return 0 -+ fi - } - - LoadConfig $FCCONFIG -@@ -676,14 +726,74 @@ - echo "OK, using $fanval" - } - -+# Remember the path and name of each device with at least one -+# reference (pwm, temp or fan) in the configuration file. -+# This function sets globals DEVPATH and DEVNAME as a side effect. -+function RememberDevices() -+{ -+ local used entry device name path tempfandev pwmdev -+ DEVPATH="" -+ DEVNAME="" -+ -+ for device in $DEVICES -+ do -+ device=`echo "$device" | sed -e 's/\/.*$//'` -+ -+ used=0 -+ for entry in $1 $2 -+ do -+ pwmdev=`echo "$entry" | sed -e 's/\/.*$//'` -+ tempfandev=`echo "$entry" | sed -e 's/^[^=]*=//' -e 's/\/.*$//'` -+ -+ if [ "$device" = "$pwmdev" -o "$device" = "$tempfandev" ] -+ then -+ used=1 -+ fi -+ done -+ if [ "$used" -eq 0 ] -+ then -+ continue -+ fi -+ -+ # Record the device path and name. This lets the fancontrol -+ # script check that they didn't change. If they did, then the -+ # configuration file can no longer be trusted. -+ path=`DevicePath "$device"` -+ if [ -z "$DEVPATH" ] -+ then -+ DEVPATH="$device=$path" -+ else -+ DEVPATH="$DEVPATH $device=$path" -+ fi -+ -+ name=`DeviceName "$device"` -+ if [ -z "$DEVNAME" ] -+ then -+ DEVNAME="$device=$name" -+ else -+ DEVNAME="$DEVNAME $device=$name" -+ fi -+ done -+} -+ - function SaveConfig() - { -+ RememberDevices "$FCTEMPS" "$FCFANS" -+ - echo - echo "Saving configuration to $FCCONFIG..." - tmpfile=`mktemp -t pwmcfg.XXXXXXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1; } - trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 - echo "# Configuration file generated by pwmconfig, changes will be lost" >$tmpfile -- echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile -+ echo "INTERVAL=$INTERVAL" >>$tmpfile -+ echo "DEVPATH=$DEVPATH" >>$tmpfile -+ echo "DEVNAME=$DEVNAME" >>$tmpfile -+ echo "FCTEMPS=$FCTEMPS" >>$tmpfile -+ echo "FCFANS=$FCFANS" >>$tmpfile -+ echo "MINTEMP=$MINTEMP" >>$tmpfile -+ echo "MAXTEMP=$MAXTEMP" >>$tmpfile -+ echo "MINSTART=$MINSTART" >>$tmpfile -+ echo "MINSTOP=$MINSTOP" >>$tmpfile - [ -n "$MINPWM" ] && echo "MINPWM=$MINPWM" >>$tmpfile - [ -n "$MAXPWM" ] && echo "MAXPWM=$MAXPWM" >>$tmpfile - mv $tmpfile $FCCONFIG ---- lm_sensors-3.1.1.orig/prog/pwm/fancontrol.8 (révision 5743) -+++ lm_sensors-3.1.1/prog/pwm/fancontrol.8 (copie de travail) -@@ -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 - -@@ -38,13 +38,21 @@ - This variable defines at which interval in seconds the main loop of - \fBfancontrol\fP will be executed - .TP -+.B DEVPATH -+Maps hwmon class devices to physical devices. This lets \fBfancontrol\fP -+check that the configuration file is still up-to-date. -+.TP -+.B DEVNAME -+Records hwmon class device names. This lets \fBfancontrol\fP check that -+the configuration file is still up-to-date. -+.TP - .B FCTEMPS - Maps PWM outputs to temperature sensors so \fBfancontrol\fP knows which - temperature sensors should be used for calculation of new values for - the corresponding PWM outputs. - .TP - .B FCFANS --FCFANS records the association between a PWM and a fan. -+Records the association between a PWM output and a fan input. - Then \fBfancontrol\fP can check the fan speed and restart it if it - stops unexpectedly. - .TP -@@ -92,6 +100,12 @@ - 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 devices -+do exist and match what they were at configuration time, and 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 diff --git a/sensors.changes b/sensors.changes index 3d163c7..6c03649 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 4 12:46:28 CET 2010 - jdelvare@suse.de + +- Update to lm_sensors 3.1.2 + * Support for future kernels and HID devices in libsensors + * Cleanups to sensord + * New chips known by sensors-detect, as usual + ------------------------------------------------------------------- Fri Dec 18 22:54:36 CET 2009 - jengelh@medozas.de diff --git a/sensors.spec b/sensors.spec index 609ef82..1b9b48a 100644 --- a/sensors.spec +++ b/sensors.spec @@ -1,5 +1,5 @@ # -# spec file for package sensors (Version 3.1.1) +# spec file for package sensors (Version 3.1.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: sensors BuildRequires: bison flex rrdtool-devel Url: http://www.lm-sensors.org/ -Version: 3.1.1 -Release: 5 +Version: 3.1.2 +Release: 1 Summary: Hardware health monitoring for Linux License: GPLv2+ Group: System/Monitoring @@ -35,10 +35,7 @@ Patch1: lm_sensors-3.1.1-build.patch Patch2: lm_sensors-3.0.0-sensord-separate.patch Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch -Patch5: lm_sensors-r5757-LPC47M233-not-supported.patch -Patch6: lm_sensors-r5760-rename-modprobe-conf.patch -Patch7: lm_sensors-r5770-fancontrol-update.patch -Patch8: lm_sensors-3.1.1-no-ipmisensors-driver.patch +Patch5: lm_sensors-3.1.1-no-ipmisensors-driver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -141,9 +138,6 @@ Authors: %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS"