This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
73995d6421
commit
e387e04315
@ -1,7 +1,5 @@
|
|||||||
Index: Makefile
|
--- Makefile
|
||||||
===================================================================
|
+++ Makefile 2008-03-13 00:00:00.000000000 +0100
|
||||||
--- Makefile.orig
|
|
||||||
+++ Makefile
|
|
||||||
@@ -136,7 +136,7 @@ ifeq ($(DEBUG),1)
|
@@ -136,7 +136,7 @@ ifeq ($(DEBUG),1)
|
||||||
ALL_CPPFLAGS += -DDEBUG
|
ALL_CPPFLAGS += -DDEBUG
|
||||||
ALL_CFLAGS += -O -g
|
ALL_CFLAGS += -O -g
|
||||||
@ -11,10 +9,8 @@ Index: Makefile
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WARN),1)
|
ifeq ($(WARN),1)
|
||||||
Index: prog/init/README
|
--- prog/init/README
|
||||||
===================================================================
|
+++ prog/init/README 2008-03-13 00:00:00.000000000 +0100
|
||||||
--- prog/init/README.orig
|
|
||||||
+++ prog/init/README
|
|
||||||
@@ -10,7 +10,7 @@ The script lm_sensors.init is a nice sta
|
@@ -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
|
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
|
mechanism (i.e. SVR4-based), as opposed to the everything-in-one-script
|
||||||
@ -37,10 +33,8 @@ Index: prog/init/README
|
|||||||
For more information see the top of the file.
|
For more information see the top of the file.
|
||||||
|
|
||||||
To configure this service one should put appropriate "alias i2c-bus-0 xxx"
|
To configure this service one should put appropriate "alias i2c-bus-0 xxx"
|
||||||
Index: prog/init/lm_sensors.init.suse
|
--- prog/init/lm_sensors.init.suse
|
||||||
===================================================================
|
+++ prog/init/lm_sensors.init.suse 2008-03-13 18:49:33.350172134 +0100
|
||||||
--- prog/init/lm_sensors.init.suse.orig
|
|
||||||
+++ prog/init/lm_sensors.init.suse
|
|
||||||
@@ -1,19 +1,15 @@
|
@@ -1,19 +1,15 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
@ -69,23 +63,20 @@ Index: prog/init/lm_sensors.init.suse
|
|||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -40,115 +36,91 @@
|
@@ -39,116 +35,82 @@
|
||||||
|
# in order as normal shell variables with the special names:
|
||||||
# MODULE_1, MODULE_2, MODULE_3, etc.
|
# MODULE_1, MODULE_2, MODULE_3, etc.
|
||||||
|
|
||||||
# If sensors isn't supported by the kernel, try loading the module...
|
-# If sensors isn't supported by the kernel, try loading the module...
|
||||||
-[ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
|
-[ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
|
||||||
+[ -e /sys/bus/i2c/devices ] || /sbin/modprobe i2c-dev &>/dev/null
|
-
|
||||||
|
-# Don't bother if /proc/sensors still doesn't exist, kernel doesn't have
|
||||||
# Don't bother if /proc/sensors still doesn't exist, kernel doesn't have
|
-# support for sensors.
|
||||||
# support for sensors.
|
|
||||||
-[ -e /proc/sys/dev/sensors ] || exit 0
|
-[ -e /proc/sys/dev/sensors ] || exit 0
|
||||||
-
|
-
|
||||||
+[ -e /sys/bus/i2c/devices ] || exit 0
|
-# If sensors was not already running, unload the module...
|
||||||
+
|
|
||||||
# If sensors was not already running, unload the module...
|
|
||||||
-[ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
|
-[ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
|
||||||
+[ -e /var/lock/subsys/sensors ] || /sbin/modprobe -r i2c-dev &>/dev/null
|
-
|
||||||
|
|
||||||
CONFIG=/etc/sysconfig/lm_sensors
|
CONFIG=/etc/sysconfig/lm_sensors
|
||||||
-PSENSORS=/usr/local/bin/sensors
|
-PSENSORS=/usr/local/bin/sensors
|
||||||
+PSENSORS=/usr/bin/sensors
|
+PSENSORS=/usr/bin/sensors
|
||||||
@ -150,13 +141,13 @@ Index: prog/init/lm_sensors.init.suse
|
|||||||
done
|
done
|
||||||
- $PSENSORS -s
|
- $PSENSORS -s
|
||||||
+ rc_status
|
+ rc_status
|
||||||
|
+
|
||||||
|
+ /usr/bin/sensors -s &> /dev/null
|
||||||
|
+ rc_status
|
||||||
|
|
||||||
- RETVAL=$?
|
- RETVAL=$?
|
||||||
- if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lm_sensors ; then
|
- if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lm_sensors ; then
|
||||||
- rc_status -v
|
- rc_status -v
|
||||||
+ /usr/bin/sensors -s &> /dev/null
|
|
||||||
+ rc_status
|
|
||||||
+
|
|
||||||
+ # Start fan control, if configured
|
+ # Start fan control, if configured
|
||||||
+ if test -s "$FANCONFIG" -a -x "$PFAN" ; then
|
+ if test -s "$FANCONFIG" -a -x "$PFAN" ; then
|
||||||
+ echo -n ", starting fan control: "
|
+ echo -n ", starting fan control: "
|
||||||
@ -230,7 +221,7 @@ Index: prog/init/lm_sensors.init.suse
|
|||||||
# See how we were called.
|
# See how we were called.
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
@@ -163,12 +135,12 @@ case "$1" in
|
@@ -163,12 +125,12 @@ case "$1" in
|
||||||
restart|reload)
|
restart|reload)
|
||||||
restart
|
restart
|
||||||
;;
|
;;
|
||||||
|
|||||||
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 13 18:50:04 CET 2008 - werner@suse.de
|
||||||
|
|
||||||
|
- Remove hard coded loading of i2c-dev or better i2c-core as it
|
||||||
|
should happen due auto dependcies (bnc#369798)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Feb 4 10:36:48 CET 2008 - jdelvare@suse.de
|
Mon Feb 4 10:36:48 CET 2008 - jdelvare@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -10,11 +10,12 @@
|
|||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
Name: sensors
|
Name: sensors
|
||||||
BuildRequires: bison flex rrdtool-devel
|
BuildRequires: bison flex rrdtool-devel
|
||||||
Url: http://www.lm-sensors.org/
|
Url: http://www.lm-sensors.org/
|
||||||
Version: 3.0.1
|
Version: 3.0.1
|
||||||
Release: 1
|
Release: 12
|
||||||
Summary: Hardware health monitoring for Linux
|
Summary: Hardware health monitoring for Linux
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
Group: System/Monitoring
|
Group: System/Monitoring
|
||||||
@ -196,6 +197,9 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
|
|||||||
%doc /usr/share/man/man3/*.3.gz
|
%doc /usr/share/man/man3/*.3.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 13 2008 werner@suse.de
|
||||||
|
- Remove hard coded loading of i2c-dev or better i2c-core as it
|
||||||
|
should happen due auto dependcies (bnc#369798)
|
||||||
* Mon Feb 04 2008 jdelvare@suse.de
|
* Mon Feb 04 2008 jdelvare@suse.de
|
||||||
- Update to lm_sensors 3.0.1
|
- Update to lm_sensors 3.0.1
|
||||||
* Library no longer depends on libsysfs
|
* Library no longer depends on libsysfs
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user