Hello community,
here is the log from the commit of package sensors for openSUSE:Factory
checked in at Thu Jul 30 17:00:58 CEST 2009.
--------
--- sensors/sensors.changes 2009-04-18 22:29:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2009-07-24 16:17:46.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Jul 24 16:14:47 CEST 2009 - jdelvare@suse.de
+
+- lm_sensors-r5757-LPC47M233-not-supported.patch: Don't point the
+ user at a driver which will not work.
+- lm_sensors-r5760-rename-modprobe-conf.patch: Properly name
+ the modprobe configuration file.
+
+-------------------------------------------------------------------
+Mon Jul 20 09:59:32 CEST 2009 - jdelvare@suse.de
+
+- Update to lm_sensors 3.1.1
+ * Completely reworked sensors-detect
+ * Support for multiple configuration files
+ * New default sensors.conf file
+- Include our own init script instead of patching upstream's to no
+ end.
+- Fix init script Provides (lm_sensors instead of sensors.)
+ (bnc#487479)
+- Fix init script lock file name.
+- Stop patching prog/init/README, we no longer distribute it.
+- /etc/sensors3.conf can be updated, user changes should no longer
+ go there.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
lm_sensors-3.0.0-sensord-separate.dif
lm_sensors-3.0.2.dif
lm_sensors-3.0.3.tar.bz2
lm_sensors-r5352-fix-detection-of-ADT7463-and-LM96000.patch
lm_sensors-r5366-fix-detection-of-Intel-AMB.patch
lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch
lm_sensors-r5580-sensord-survive-transient-errors.patch
lm_sensors-r5581-fix-libsensors-error-propagation.patch
New:
----
lm_sensors-3.0.0-sensord-separate.patch
lm_sensors-3.1.1-build.patch
lm_sensors-3.1.1.tar.bz2
lm_sensors-3.1.1.tar.bz2.sig
lm_sensors-r5757-LPC47M233-not-supported.patch
lm_sensors-r5760-rename-modprobe-conf.patch
lm_sensors.init
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sensors.spec ++++++
--- /var/tmp/diff_new_pack.HDANCm/_old 2009-07-30 17:00:46.000000000 +0200
+++ /var/tmp/diff_new_pack.HDANCm/_new 2009-07-30 17:00:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package sensors (Version 3.0.3)
+# spec file for package sensors (Version 3.1.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,23 +21,21 @@
Name: sensors
BuildRequires: bison flex rrdtool-devel
Url: http://www.lm-sensors.org/
-Version: 3.0.3
-Release: 6
+Version: 3.1.1
+Release: 1
Summary: Hardware health monitoring for Linux
License: GPL v2 or later
Group: System/Monitoring
Requires: modules
AutoReqProv: on
Source0: lm_sensors-%{version}.tar.bz2
-Patch: lm_sensors-3.0.2.dif
-Patch1: lm_sensors-3.0.0-sensord-separate.dif
-Patch2: lm_sensors-3.0.0-sysconfig_metadata.patch
-Patch3: lm_sensors-r5352-fix-detection-of-ADT7463-and-LM96000.patch
+Source1: lm_sensors.init
+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-r5366-fix-detection-of-Intel-AMB.patch
-Patch6: lm_sensors-r5473-sensord-negative-temperatures-in-RRD.patch
-Patch7: lm_sensors-r5580-sensord-survive-transient-errors.patch
-Patch8: lm_sensors-r5581-fix-libsensors-error-propagation.patch
+Patch5: lm_sensors-r5757-LPC47M233-not-supported.patch
+Patch6: lm_sensors-r5760-rename-modprobe-conf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390 s390x
@@ -135,15 +133,12 @@
%prep
%setup -q -n lm_sensors-%{version}
-%patch
-%patch1
-%patch2
+%patch1 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -163,7 +158,7 @@
cd ../
chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
mkdir -p $RPM_BUILD_ROOT/etc/init.d
- install -m 0755 prog/init/lm_sensors.init.suse $RPM_BUILD_ROOT/etc/init.d/lm_sensors
+ install -m 0755 %{S:1} $RPM_BUILD_ROOT/etc/init.d/lm_sensors
ln -sf /etc/init.d/lm_sensors $RPM_BUILD_ROOT/usr/sbin/rclm_sensors
# cleanup
rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
@@ -172,6 +167,30 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+sh -c '
+CONFIG=/etc/sysconfig/lm_sensors
+test -r "$CONFIG" || exit 0
+unset ${!MODULE_*} $HWMON_MODULES
+. "$CONFIG"
+test -n "$HWMON_MODULES" && exit 0
+for i in ${!MODULE_*} ; do
+ eval module=\$$i
+ if test -z "$HWMON_MODULES" ; then
+ HWMON_MODULES="$module"
+ else
+ HWMON_MODULES="$HWMON_MODULES $module"
+ fi
+done
+test -z "$HWMON_MODULES" && exit 0
+echo >> "$CONFIG"
+echo "# New configuration format generated by rpm post-install script" >> "$CONFIG"
+echo "HWMON_MODULES=\"$HWMON_MODULES\"" >> "$CONFIG"
+'
+if test -e /etc/modprobe.d/lm_sensors -a ! -e /etc/modprobe.d/lm_sensors.conf ; then
+ mv -f /etc/modprobe.d/lm_sensors /etc/modprobe.d/lm_sensors.conf
+fi
+
%preun
%{stop_on_removal lm_sensors}
@@ -211,7 +230,7 @@
%files -n libsensors4
%defattr(-,root,root)
-%config(noreplace) /etc/sensors3.conf
+%config /etc/sensors3.conf
%{_libdir}/libsensors.so.4*
%doc /usr/share/man/man5/*.5.gz
++++++ lm_sensors-3.0.0-sensord-separate.dif -> lm_sensors-3.0.0-sensord-separate.patch ++++++
--- sensors/lm_sensors-3.0.0-sensord-separate.dif 2008-07-24 01:03:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/sensors/lm_sensors-3.0.0-sensord-separate.patch 2009-07-20 12:58:57.000000000 +0200
@@ -1,8 +1,6 @@
-Index: doc/progs
-===================================================================
---- doc/progs.orig
-+++ doc/progs
-@@ -58,6 +58,8 @@ see http://www.lm-sensors.org/wiki/Usefu
+--- lm_sensors-3.1.1.orig/doc/progs
++++ lm_sensors-3.1.1/doc/progs
+@@ -53,6 +53,8 @@ see http://www.lm-sensors.org/wiki/Usefu
the sensors hardware to syslog, and to alert (using syslog level ALERT)
when a sensor alarm is signalled; for example, if a fan fails, a temperature
limit is exceeded, etc.
++++++ lm_sensors-3.0.0-sysconfig_metadata.patch ++++++
--- /var/tmp/diff_new_pack.HDANCm/_old 2009-07-30 17:00:46.000000000 +0200
+++ /var/tmp/diff_new_pack.HDANCm/_new 2009-07-30 17:00:46.000000000 +0200
@@ -1,17 +1,15 @@
-Index: prog/detect/sensors-detect
-===================================================================
---- prog/detect/sensors-detect.orig
-+++ prog/detect/sensors-detect
-@@ -6097,6 +6097,12 @@ sub main
- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
- print SYSCONFIG <<'EOT';
+--- 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
+ or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
+ print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
+ print SYSCONFIG <<'EOT';
+## Path: Hardware/Sensors
+## Description: Defines the modules to used
+## Type: string
+## ServiceRestart: lm_sensors
+## Default: ""
+#
- # /etc/sysconfig/lm_sensors - Defines modules loaded by
- # /etc/init.d/lm_sensors
- # Copyright (c) 1998 - 2001 Frodo Looijaard
+ # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
+ # be loaded/unloaded.
+ #
++++++ lm_sensors-3.0.3-hint-at-kernel-extra-package.patch ++++++
--- /var/tmp/diff_new_pack.HDANCm/_old 2009-07-30 17:00:46.000000000 +0200
+++ /var/tmp/diff_new_pack.HDANCm/_new 2009-07-30 17:00:46.000000000 +0200
@@ -6,11 +6,9 @@
prog/detect/sensors-detect | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
-Index: lm_sensors-3.0.3/prog/detect/sensors-detect
-===================================================================
---- lm_sensors-3.0.3.orig/prog/detect/sensors-detect
-+++ lm_sensors-3.0.3/prog/detect/sensors-detect
-@@ -2368,12 +2368,15 @@ sub initialize_conf
+--- 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
# [2] -> SUBLEVEL
# [3] -> EXTRAVERSION
#
@@ -19,23 +17,24 @@
sub initialize_kernel_version
{
- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
- @kernel_version = ($1, $2, $3, $4);
-+ if ($kernel_version[3] =~ /-([a-z]+)$/) {
-+ chomp($kernel_flavor = $1);
-+ }
- chomp($kernel_arch = `uname -m`);
- }
+ `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
+ @kernel_version = ($1, $2, $3, $4);
++ if ($kernel_version[3] =~ /-([a-z]+)$/) {
++ chomp($kernel_flavor = $1);
++ }
+ chomp($kernel_arch = `uname -m`);
-@@ -5819,6 +5822,11 @@ sub generate_modprobes
- "# on your system. For status of 2.6 kernel ports check\n".
- "# http://www.lm-sensors.org/wiki/Devices. If driver is built\n".
- "# into the kernel, or unavailable, comment out the following line.\n";
-+ if ($kernel_flavor) {
-+ print "WARNING! The required module $chip->{driver} is not currently installed\n".
-+ "on your system. You may need to install package kernel-$kernel_flavor-extra\n".
-+ "for lm-sensors to work properly.\n\n";
-+ }
- }
- $modprobes .= "modprobe $chip->{driver}\n";
- }
+ # We only support kernels >= 2.6.5
+@@ -5402,7 +5405,11 @@ sub generate_modprobes
+ # isn't supported
+ if ((($? >> 8) == 0) && ! $modulefound) {
+ print "Warning: the required module $driver is not currently installed\n".
+- "on your system. If it is built into the kernel then it's OK.\n".
++ "on your system. ".
++ ($kernel_flavor ?
++ "You may need to install package\n".
++ "kernel-$kernel_flavor-extra for lm-sensors to work properly.\n" :
++ "If it is built into the kernel then it's OK.\n").
+ "Otherwise, check http://www.lm-sensors.org/wiki/Devices for\n".
+ "driver availability.\n\n";
+ } else {
++++++ lm_sensors-3.1.1-build.patch ++++++
--- lm_sensors-3.1.1.orig/Makefile
+++ lm_sensors-3.1.1/Makefile
@@ -140,7 +140,7 @@ ifeq ($(DEBUG),1)
ALL_CPPFLAGS += -DDEBUG
ALL_CFLAGS += -O -g
else
-ALL_CFLAGS += -O2
+ALL_CFLAGS += $(RPM_OPT_FLAGS)
endif
ifeq ($(WARN),1)
++++++ lm_sensors-3.0.3.tar.bz2 -> lm_sensors-3.1.1.tar.bz2 ++++++
++++ 19060 lines of diff (skipped)
++++++ lm_sensors-r5757-LPC47M233-not-supported.patch ++++++
Upstream commit: http://www.lm-sensors.org/changeset/5757
The SMSC LPC47M233 isn't currently supported. If it ever is, it will most
probably not be by the smsc47m1 driver.
--- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
+++ lm_sensors-3.1.1/prog/detect/sensors-detect
@@ -1415,7 +1415,7 @@ use constant FEAT_SMBUS => (1 << 7);
features => FEAT_FAN,
}, {
name => "SMSC LPC47M233 Super IO Sensors",
- driver => "smsc47m1",
+ driver => "to-be-written",
devid => 0x6b80,
devid_mask => 0xff80,
logdev => 0x0a,
++++++ lm_sensors-r5760-rename-modprobe-conf.patch ++++++
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');
$_ = <STDIN>;
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);
++++++ lm_sensors.init ++++++
#!/bin/sh
#
### BEGIN INIT INFO
# Provides: lm_sensors
# Required-Start: $remote_fs
# Required-Stop: $remote_fs
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Load and configure hardware monitoring drivers
# Description: sensors is used for monitoring motherboard sensor values.
# Config file is /etc/sysconfig/lm_sensors
### END INIT INFO
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
# See also the lm_sensors homepage at:
# http://www.lm-sensors.org
# It uses a config file /etc/sysconfig/lm_sensors that contains the modules
# to be loaded/unloaded. That file is sourced into this one.
# The format of that file a shell script that simply defines the modules
# in order as normal shell variables with the special names:
# MODULE_1, MODULE_2, MODULE_3, etc.
CONFIG=/etc/sysconfig/lm_sensors
LOCK=/var/lock/subsys/lm_sensors
PSENSORS=/usr/bin/sensors
FANCONFIG=/etc/fancontrol
PFAN=/usr/sbin/fancontrol
# Source function library.
. /etc/rc.status
start() {
echo -n "Starting up sensors"
unset ${!MODULE_*}
test -r "$CONFIG" && . "$CONFIG"
for i in ${!MODULE_*} ; do
eval module=\$$i
/sbin/modprobe $module &>/dev/null
rc_status
done
rc_status
/usr/bin/sensors -s &> /dev/null
rc_status
# Start fan control, if configured
if test -s "$FANCONFIG" -a -x "$PFAN" ; then
echo -n ", starting fan control: "
/sbin/startproc -q "$PFAN"
rc_status
else
echo -n ": "
fi
rc_status -v && touch $LOCK
}
stop() {
echo -n "Shutting down sensors"
unset ${!MODULE_*}
test -r "$CONFIG" && . "$CONFIG"
# Stop fan control, if it was started
if test -s /var/run/fancontrol.pid ; then
echo -n ", stopping fan control: "
/sbin/killproc -TERM "$PFAN"
rc_status
else
echo -n ": "
fi
for i in ${!MODULE_*} ; do
eval module=\$$i
/sbin/modprobe -r $module &>/dev/null
rc_status
done
rc_status -v && rm -f $LOCK
}
dostatus() {
$PSENSORS
rc_status
}
restart() {
stop
start
rc_status
}
condrestart() {
[ -e $LOCK ] && restart || :
}
# Reset status of this service
rc_reset
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
status)
dostatus
;;
restart|reload)
restart
;;
try-restart)
condrestart
;;
*)
echo "Usage: lm_sensors {start|stop|status|restart|reload|try-restart}"
exit 1
esac
rc_exit
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org