This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
b219883323
commit
aace7cf16b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:90eba6cf01772557aa151621116f92c16e1a5fb0111c00ff5d5fb1d1c285e98b
|
||||
size 685127
|
||||
@ -1,5 +1,5 @@
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
--- Makefile
|
||||
+++ Makefile 2007-08-01 00:00:00.000000000 +0200
|
||||
@@ -45,8 +45,8 @@ LINUX_HEADERS := $(LINUX)/include
|
||||
# may be used mistakenly. Note: This should point to the directory
|
||||
# *above* the linux/ subdirectory, so to /usr/local/include in the
|
||||
@ -47,30 +47,19 @@
|
||||
endif
|
||||
|
||||
ifeq ($(WARN),1)
|
||||
--- prog/detect/sensors-detect.orig
|
||||
+++ prog/detect/sensors-detect
|
||||
@@ -2147,7 +2147,9 @@ sub initialize_conf
|
||||
}
|
||||
}
|
||||
|
||||
- if (-f '/etc/modules.conf') {
|
||||
+ if (-f '/etc/modprobe.conf') {
|
||||
+ $modules_conf = '/etc/modprobe.conf';
|
||||
+ } elsif (-f '/etc/modules.conf') {
|
||||
$modules_conf = '/etc/modules.conf';
|
||||
} elsif (-f '/etc/conf.modules') {
|
||||
$modules_conf = '/etc/conf.modules';
|
||||
@@ -5416,7 +5418,7 @@ sub generate_modprobes
|
||||
--- prog/detect/sensors-detect
|
||||
+++ prog/detect/sensors-detect 2007-08-01 15:19:55.706591921 +0200
|
||||
@@ -5416,7 +5416,7 @@ sub generate_modprobes
|
||||
$modprobes .= "# I2C adapter drivers\n" if $nr;
|
||||
for ($i = 0; $i < $nr; $i++) {
|
||||
foreach $adap (@adapters) {
|
||||
foreach $adap (@i2c_adapters) {
|
||||
- next unless exists $adap->{nr_later} and $adap->{nr_later} == $i;
|
||||
+ next unless exists $adap->{driver} and $adap->{nr_later} == $i;
|
||||
if ($adap->{driver} eq "UNKNOWN") {
|
||||
$modprobes .= "# modprobe unknown adapter ".$adap->{adapname}."\n";
|
||||
$modprobes .= "# modprobe unknown adapter ".$adap->{name}."\n";
|
||||
} elsif ($adap->{driver} eq "DISABLED") {
|
||||
@@ -5446,6 +5448,19 @@ sub generate_modprobes
|
||||
next if $chip->{driver} eq "use-isa-instead";
|
||||
@@ -5448,6 +5448,19 @@ sub generate_modprobes
|
||||
next if not @{$chip->{detected}};
|
||||
if ($chip->{driver} eq "to-be-written") {
|
||||
$modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet\n";
|
||||
+ } elsif ($chip->{driver} eq "w83627hf") {
|
||||
@ -89,16 +78,7 @@
|
||||
} else {
|
||||
# need the * for 2.4 kernels, won't necessarily be an exact match
|
||||
open(local *INPUTFILE, "modprobe -l $chip->{driver}\\* 2>/dev/null |");
|
||||
@@ -5727,7 +5742,7 @@ sub main
|
||||
print "#----cut here----\n".
|
||||
$modprobes.
|
||||
"# sleep 2 # optional\n".
|
||||
- "/usr/local/bin/sensors -s # recommended\n".
|
||||
+ "/usr/bin/sensors -s # recommended\n".
|
||||
"#----cut here----\n\n";
|
||||
|
||||
print "If you have some drivers built into your kernel, the list above will\n".
|
||||
@@ -5796,6 +5811,8 @@ EOT
|
||||
@@ -5789,6 +5802,8 @@ EOT
|
||||
print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
|
||||
"for initialization at boot time.\n"
|
||||
unless -f "/etc/init.d/lm_sensors";
|
||||
@ -107,8 +87,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
--- prog/init/README.orig
|
||||
+++ prog/init/README
|
||||
--- prog/init/README
|
||||
+++ prog/init/README 2007-08-01 00:00:00.000000000 +0200
|
||||
@@ -10,7 +10,7 @@ The script lm_sensors.init is a nice sta
|
||||
On RH and other RH-based systems (MDK, notably) use this sort of startup
|
||||
mechanism (i.e. SVR4-based), as opposed to the everything-in-one-script
|
||||
@ -116,9 +96,9 @@
|
||||
-The lm_sensors.init file should be copied to /etc/rc.d/init.d/lm_sensors.
|
||||
+The lm_sensors.init file should be copied to /etc/init.d/lm_sensors.
|
||||
For more information see the top of the file.
|
||||
It requires the /etc/sysconfig/sensors file, which identifies
|
||||
It requires the /etc/sysconfig/lm_sensors file, which identifies
|
||||
the correct modules.
|
||||
@@ -28,10 +28,10 @@ by Marc Rieffel <marc@paracel.com>.
|
||||
@@ -27,10 +27,10 @@ by Marc Rieffel <marc@paracel.com>.
|
||||
----------------
|
||||
|
||||
The script sensord.init also loads the modules, and then
|
||||
@ -131,8 +111,8 @@
|
||||
For more information see the top of the file.
|
||||
|
||||
To configure this service one should put appropriate "alias i2c-bus-0 xxx"
|
||||
--- prog/init/lm_sensors.init.suse.orig
|
||||
+++ prog/init/lm_sensors.init.suse
|
||||
--- prog/init/lm_sensors.init.suse
|
||||
+++ prog/init/lm_sensors.init.suse 2007-08-01 15:21:17.447299679 +0200
|
||||
@@ -1,19 +1,15 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
@ -157,7 +137,7 @@
|
||||
### END INIT INFO
|
||||
-# chkconfig: 2345 26 74
|
||||
-# description: sensors is used for monitoring motherboard sensor values.
|
||||
-# config: /etc/sysconfig/sensors
|
||||
-# config: /etc/sysconfig/lm_sensors
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -338,8 +318,8 @@
|
||||
|
||||
-exit $RETVAL
|
||||
+rc_exit
|
||||
--- prog/init/sensord.init.orig
|
||||
+++ prog/init/sensord.init
|
||||
--- prog/init/sensord.init
|
||||
+++ prog/init/sensord.init 2007-08-01 00:00:00.000000000 +0200
|
||||
@@ -1,130 +1,84 @@
|
||||
-#!@BASH@
|
||||
+#!/bin/bash
|
||||
@ -534,74 +514,3 @@
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
--- prog/pwm/fancontrol.orig
|
||||
+++ prog/pwm/fancontrol
|
||||
@@ -188,10 +188,10 @@ function restorefans()
|
||||
do
|
||||
pwmo=${AFCPWM[$fcvcount]}
|
||||
pwmdisable $pwmo
|
||||
- fcvcount=$fcvcount+1
|
||||
+ let fcvcount=$fcvcount+1
|
||||
done
|
||||
echo 'Verify fans have returned to full speed'
|
||||
- exit 1
|
||||
+ exit 0
|
||||
}
|
||||
|
||||
trap restorefans SIGHUP SIGINT SIGQUIT SIGTERM SIGKILL
|
||||
@@ -274,7 +274,7 @@ function UpdateFanSpeeds {
|
||||
if [ $pwmpval -eq 0 -o $fanval -eq 0 ]
|
||||
then # if fan was stopped start it using a safe value
|
||||
echo $minsa > $pwmo
|
||||
- sleep 1
|
||||
+ read < <(exec sleep 1)
|
||||
fi
|
||||
fi
|
||||
echo $pwmval > $pwmo # write new value to pwm output
|
||||
@@ -287,7 +287,7 @@ function UpdateFanSpeeds {
|
||||
then
|
||||
echo "new pwmval=$pwmval"
|
||||
fi
|
||||
- fcvcount=$fcvcount+1
|
||||
+ let fcvcount=$fcvcount+1
|
||||
done
|
||||
}
|
||||
|
||||
@@ -302,7 +302,7 @@ do
|
||||
echo "Error enabling PWM on $DIR/$pwmo"
|
||||
restorefans
|
||||
fi
|
||||
- fcvcount=$fcvcount+1
|
||||
+ let fcvcount=$fcvcount+1
|
||||
done
|
||||
|
||||
echo 'Starting automatic fan control...'
|
||||
@@ -311,7 +311,7 @@ echo 'Starting automatic fan control...'
|
||||
while true
|
||||
do
|
||||
UpdateFanSpeeds
|
||||
- sleep $INTERVAL
|
||||
+ read < <(exec sleep $INTERVAL)
|
||||
done
|
||||
|
||||
# some old stuff/missing features, will clean this up soon
|
||||
--- prog/pwm/pwmconfig.orig
|
||||
+++ prog/pwm/pwmconfig
|
||||
@@ -248,6 +248,9 @@ echo
|
||||
PLOTTER=gnuplot
|
||||
STEP=15
|
||||
PDELAY=2
|
||||
+STEP2=2
|
||||
+STEP2_BELOW=31
|
||||
+PDELAY=3
|
||||
|
||||
function pwmdetail()
|
||||
{
|
||||
@@ -315,6 +318,7 @@ function pwmdetail()
|
||||
fi
|
||||
break
|
||||
fi
|
||||
+ test $pwm -lt $STEP2_BELOW && let STEP=$STEP2
|
||||
let pwm=$pwm-$STEP
|
||||
done
|
||||
pwmdisable $P
|
||||
3
lm_sensors-2.10.4.tar.bz2
Normal file
3
lm_sensors-2.10.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:40244e81750efade771e2b0e49d96000fe69f00d25b1f16d8e58361ff1ec3ff0
|
||||
size 690222
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 1 15:41:26 CEST 2007 - werner@suse.de
|
||||
|
||||
- Update to lm_sensors version 2.10.4
|
||||
* added support for recent devices and cips like
|
||||
dme1737, applesmc, abituguru3, f71882fg, w83627ehf (kernel 2.4)
|
||||
support for the w83627ehf VID function
|
||||
support for the w83627ehf thermal sensor types
|
||||
support for it87 fan4 and fan5
|
||||
* support block reads with specified length of I2C devices
|
||||
* A lot of fixes and enhancements
|
||||
* Add both patches form us for fancontrol and pwmconfig
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 27 13:37:35 CEST 2007 - jdelvare@suse.de
|
||||
|
||||
|
||||
23
sensors.spec
23
sensors.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package sensors (Version 2.10.3)
|
||||
# spec file for package sensors (Version 2.10.4)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -13,16 +13,16 @@
|
||||
Name: sensors
|
||||
BuildRequires: bison flex rrdtool-devel sysfsutils udev
|
||||
URL: http://www.lm-sensors.org/
|
||||
Version: 2.10.3
|
||||
Release: 33
|
||||
Version: 2.10.4
|
||||
Release: 1
|
||||
Summary: Hardware health monitoring for Linux
|
||||
License: GNU General Public License (GPL)
|
||||
License: GPL v2 or later
|
||||
Group: System/Monitoring
|
||||
Requires: modules udev
|
||||
Autoreqprov: on
|
||||
Source0: lm_sensors-2.10.3.tar.bz2
|
||||
Source0: lm_sensors-2.10.4.tar.bz2
|
||||
Source1: README.SuSE
|
||||
Patch: lm_sensors-2.10.3.dif
|
||||
Patch: lm_sensors-2.10.4.dif
|
||||
Patch1: lm_sensors-no-xeon-script.dif
|
||||
Patch2: lm_sensors-2.7.0-kernelheaders.dif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -77,7 +77,6 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
|
||||
cp ${RPM_SOURCE_DIR}/README.SuSE $RPM_BUILD_ROOT/%{_docdir}/sensors/
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init
|
||||
install -m 0755 prog/init/lm_sensors.init.suse $RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init/
|
||||
install -m 0644 prog/init/lm_sensors.sysconfig $RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init/
|
||||
install -m 0755 prog/init/sensord.init $RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init/
|
||||
install -m 0644 prog/init/README $RPM_BUILD_ROOT/%{_docdir}/sensors/prog/init/
|
||||
chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
|
||||
@ -108,6 +107,16 @@ rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid.pl
|
||||
%doc /usr/share/man/man8/*.8.gz
|
||||
|
||||
%changelog
|
||||
* Wed Aug 01 2007 - werner@suse.de
|
||||
- Update to lm_sensors version 2.10.4
|
||||
* added support for recent devices and cips like
|
||||
dme1737, applesmc, abituguru3, f71882fg, w83627ehf (kernel 2.4)
|
||||
support for the w83627ehf VID function
|
||||
support for the w83627ehf thermal sensor types
|
||||
support for it87 fan4 and fan5
|
||||
* support block reads with specified length of I2C devices
|
||||
* A lot of fixes and enhancements
|
||||
* Add both patches form us for fancontrol and pwmconfig
|
||||
* Wed Jun 27 2007 - jdelvare@suse.de
|
||||
- Don't package the decode-edid.pl script. It requires parse-edid
|
||||
from the read-edid package, which isn't included in Suse.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user