Hello community,
here is the log from the commit of package sensors.3871 for openSUSE:13.1:Update checked in at 2015-07-04 11:16:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/sensors.3871 (Old)
and /work/SRC/openSUSE:13.1:Update/.sensors.3871.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sensors.3871"
Changes:
--------
New Changes file:
--- /dev/null 2015-06-25 09:04:34.320025005 +0200
+++ /work/SRC/openSUSE:13.1:Update/.sensors.3871.new/sensors.changes 2015-07-04 11:16:56.000000000 +0200
@@ -0,0 +1,866 @@
+-------------------------------------------------------------------
+Wed Jun 24 18:23:56 CEST 2015 - jdelvare@suse.de
+
+- lm_sensors-r6255-fancontrol-fix-shell-error.patch:
+ fancontrol: Fix shell error when FCFANS is not set (bsc#903520).
+- lm_sensors-r6282-detect-graphics-card-in-all-cases.patch:
+ sensors-detect: Detect graphics card in all cases (bsc#933072).
+- lm_sensors-r6283-skip-addresses-0x37-0x4f-on-DDC.patch:
+ sensors-detect: Skip addresses 0x37 and 0x4f on DDC channels
+ (bsc#933072).
+
+-------------------------------------------------------------------
+Mon Jul 1 19:18:59 UTC 2013 - coolo@suse.com
+
+- sensors is required for pacemaker and libdlm, and as such
+ we should not buildrequire systemd
+
+-------------------------------------------------------------------
+Mon Jun 3 13:55:39 CEST 2013 - jdelvare@suse.de
+
+- Update to lm_sensors 3.3.4
+ * Mostly a packaging-only clean-up, as we had backported most
+ important changes already.
+ * lm_sensors-r6111-detection-Winbond-W83627SF.diff,
+ lm_sensors-r6112-detection-AMD-family-16h.diff,
+ lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff,
+ lm_sensors-r6117-detection-ITE-IT8752F.diff,
+ lm_sensors-r6123-AnalogDev-ADT7410-driver.diff,
+ lm_sensors-r6163-pwmconfig-raise-threshold.diff,
+ lm_sensors-r6164-pwmconfig-drop-comment.diff,
+ lm_sensors-r6165-pwmconfig-multiple-fans.diff,
+ lm_sensors-r6172-fancontrol-absolute-paths.diff: Removed,
+ upstream now.
+ * fancontrol.service: Removed, now provided by upstream,
+ together with sensord.service.
+ * lm_sensors-3.0.0-sysconfig_metadata.patch,
+ lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.
+- lm_sensors-r6181-fix-service-files.patch: Fix EnvironmentFile
+ in service files
+
+-------------------------------------------------------------------
+Thu May 23 18:30:31 CEST 2013 - jdelvare@suse.de
+
+- lm_sensors-r6163-pwmconfig-raise-threshold.diff: pwmconfig: Raise
+ the detection threshold to 3/4 (bnc#810344).
+- lm_sensors-r6164-pwmconfig-drop-comment.diff: pwmconfig: Drop a
+ stray comment.
+- lm_sensors-r6165-pwmconfig-multiple-fans.diff: pwmconfig:
+ Properly deal with multiple fan control (bnc#810344).
+- lm_sensors-r6172-fancontrol-absolute-paths.diff: fancontrol: Fix
+ handling of absolute paths in config (bnc#810344).
+
+-------------------------------------------------------------------
+Thu May 23 18:06:50 CEST 2013 - jdelvare@suse.de
+
+- fancontrol.service: Cleanups.
+
+-------------------------------------------------------------------
+Sat May 18 11:58:47 UTC 2013 - werner@suse.com
+
+- Add fancontrol.service (bnc#810344).
+
+-------------------------------------------------------------------
+Fri Apr 5 12:06:46 UTC 2013 - idonmez@suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
+Thu Feb 28 18:43:13 CET 2013 - jdelvare@suse.de
+
+- lm_sensors-r6111-detection-Winbond-W83627SF.diff: Add detection
+ of Winbond W83627SF/GF (no sensors.)
+- lm_sensors-r6112-detection-AMD-family-16h.diff: Add detection of
+ AMD family 16h power sensors.
+- lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff: Map IT8771E,
+ IT8772E, IT8782F and IT8783F to it87.
+- lm_sensors-r6117-detection-ITE-IT8752F.diff: Add detection of
+ IT8752F.
+- lm_sensors-r6123-AnalogDev-ADT7410-driver.diff: We have a driver
+ for the ADT7410 since kernel 3.7.
+
+-------------------------------------------------------------------
+Fri Nov 9 21:40:32 UTC 2012 - hrvoje.senjan@gmail.com
+
+- Update to lm_sensors 3.3.3
+ * documentation: Update fan-divisors, fan divisors are optional
+ * libsensors: Fix warning about library path not in /etc/ld.so.conf
+ * sensors: Fix libiconv linkage need detection in rare corner case
+ Add support for humidity output
+ Add long switches to manual page
+ * sensors-detect: Don't choke on systems without PCI
+ Avoid probing EDID addresses on graphics cards (#2386)
+ Add detection of NCT6779D and NCT6102D/NCT6106D
+ Add detection of SMSC LPC47N217 and SIO10N268
+ Do not scan I2C adapters on graphics cards by default
+ Fix parent class discovery when multiplexer is present
+
+-------------------------------------------------------------------
+Thu Nov 1 02:22:53 UTC 2012 - crrodriguez@opensuse.org
+
+- lm_sensors systemd service file missing [bnc#768354]
+
+-------------------------------------------------------------------
+Thu Sep 13 23:21:43 UTC 2012 - jengelh@inai.de
+
+- Remove redundant tags/sections from specfile
+- Use the "modutils" require instead of "modules" to select a
+ module toolset implementation
+
+-------------------------------------------------------------------
+Tue Mar 20 18:08:30 CET 2012 - jdelvare@suse.de
+
+- Update to lm_sensors 3.3.2
+ * Support for many subfeatures implemented by new hwmon drivers.
+ * Fix to support a sysfs implementation change in upcoming kernels.
+ * Better printing of power sensors in sensors.
+ * Memory leaks fixed in sensord.
+ * New chips known by sensors-detect, as usual.
+- lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch,
+ lm_sensors-r5992-print-DMI-product-version.patch,
+ lm_sensors-r5993-fix-loading-of-cpuid-module.patch,
+ lm_sensors-r6016-handle-superio-wo-logdev.patch,
+ lm_sensors-r6017-fix-sysfs-detection.patch,
+ lm_sensors-r6025-sensord-fix-memory-leaks.patch,
+ lm_sensors-r6030-fix-power-interval-output.patch: Removes,
+ obsolete.
+
+-------------------------------------------------------------------
+Thu Mar 8 10:35:17 CET 2012 - jdelvare@suse.de
+
+- lm_sensors-r5993-fix-loading-of-cpuid-module.patch: Fix loading
+ of the cpuid module.
+- lm_sensors-r6016-handle-superio-wo-logdev.patch: Properly handle
+ Super-I/O chips without logical device.
+- lm_sensors-r6017-fix-sysfs-detection.patch: libsensors: Change
+ sysfs detection to survive upcoming kernel changes (bnc#751180).
+- lm_sensors-r6025-sensord-fix-memory-leaks.patch: sensord: Fix
+ memory leaks revealed by valgrind (bnc#751177).
+- lm_sensors-r6030-fix-power-interval-output.patch: Fix power
+ interval output.
+
+-------------------------------------------------------------------
+Tue Jan 17 12:50:05 CET 2012 - jdelvare@suse.de
+
+- Package /etc/sensors.d/.
+
+-------------------------------------------------------------------
+Thu Sep 22 13:11:43 UTC 2011 - jdelvare@suse.de
+
+- lm_sensors.init: Move lock file from /var/lock/subsys to
+ /var/run (bnc#714654).
+
+-------------------------------------------------------------------
+Fri Jul 22 18:56:09 CEST 2011 - jdelvare@suse.de
+
+- Update to lm_sensors 3.3.1
+ * Detection of new devices
+- lm_sensors-3.1.1-no-ipmisensors-driver.patch: Removed, obsolete.
+- lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch,
+ lm_sensors-r5992-print-DMI-product-version.patch: Improve DMI
+ product identification.
+
+-------------------------------------------------------------------
+Tue Mar 29 19:09:05 CEST 2011 - jdelvare@suse.de
+
+- Update to lm_sensors 3.3.0
+ * Support for chassis intrusion and humidity sensors
+ * Support for many new attributes
+ * Detection of new devices
+- lm_sensors-r5952-new-fintek-chips.patch: Fix driver mapping of
+ two new Fintek chips.
+
+-------------------------------------------------------------------
+Thu Feb 17 21:07:45 CET 2011 - jdelvare@suse.de
+
+- lm_sensors-r5930-fix-DDR3-SPD-detection.patch: Fix typo in
+ comparison.
+
+-------------------------------------------------------------------
+Thu Feb 17 10:13:12 CET 2011 - jdelvare@suse.de
+
+- lm_sensors-r5910-detect-new-Nuvoton-superio.patch: Add detection
+ of Nuvoton NCT5571D, NCT5577D and NCT6776F.
+- lm_sensors-r5913-default-config-NCT677xF.patch: Default config
+ for NCT6775F and NCT6776F.
+- lm_sensors-r5914-fix-TMP421-detection.patch: We probe addresses
+ 0x1c-0x1f for other chips now, so we might as well look for
+ TMP421 devices there.
+- lm_sensors-r5916-fix-EMC140x-detection.patch: Fix addresses
+ checked for SMSC EMC1403 and EMC1404.
+- lm_sensors-r5930-fix-DDR3-SPD-detection.patch: Fix detection of
+ SPD EEPROM on DDR3 memory modules. DDR3 uses CRC16 over 128 bytes
+ instead of basic checksum over 64 bytes. Contributed by Clemens
+ Ladisch.
+- libensors-visibility.patch: Add 3 missing symbols.
+
+-------------------------------------------------------------------
++++ 669 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:13.1:Update/.sensors.3871.new/sensors.changes
New:
----
baselibs.conf
lm_sensors-3.0.0-sensord-separate.patch
lm_sensors-3.0.0-sysconfig_metadata.patch
lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
lm_sensors-3.1.1-build.patch
lm_sensors-3.3.4.tar.bz2
lm_sensors-r6181-fix-service-files.patch
lm_sensors-r6255-fancontrol-fix-shell-error.patch
lm_sensors-r6282-detect-graphics-card-in-all-cases.patch
lm_sensors-r6283-skip-addresses-0x37-0x4f-on-DDC.patch
lm_sensors.init
sensors.changes
sensors.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sensors.spec ++++++
#
# spec file for package sensors
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: sensors
BuildRequires: bison
BuildRequires: flex
BuildRequires: rrdtool-devel
BuildRequires: systemd-rpm-macros
Url: http://www.lm-sensors.org/
Version: 3.3.4
Release: 0
Summary: Hardware health monitoring for Linux
License: GPL-2.0+
Group: System/Monitoring
Requires: modutils
Source0: http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-%{version}.tar.bz2
Source1: lm_sensors.init
Source2: baselibs.conf
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-r6181-fix-service-files.patch
Patch6: lm_sensors-r6255-fancontrol-fix-shell-error.patch
Patch7: lm_sensors-r6282-detect-graphics-card-in-all-cases.patch
Patch8: lm_sensors-r6283-skip-addresses-0x37-0x4f-on-DDC.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390 s390x
%{?systemd_requires}
%description
This package includes programs that show data from some sensor chips.
The interface /proc/bus/i2c/ is provided by loading kernel modules.
Which modules to load can be interactively detected as root by calling
/usr/sbin/sensors-detect. Warning, before using the sensors the default
configuration in /etc/sensors.conf has to be checked and changed to fit
the actual set up of the mainboard and the BIOS used on that specific
mainboard!
Authors:
--------
Simon G. Vogl
Mark D. Studebaker
Philip Edelbrock
Ky�sti M�lkki
Fons Rademakers
Frodo Looijaard
Geert Uytterhoeven
%package -n sensord
Summary: Hardware health monitoring daemon
License: GPL-2.0+
Group: System/Monitoring
Provides: sensors:/usr/sbin/sensord
%description -n sensord
sensord is a daemon that can be used to periodically log sensor
readings from hardware health-monitoring chips to the system logs or a
round-robin database (RRD) and to alert when a sensor alarm is
signalled; for example, if a fan fails, a temperature limit is
exceeded, etc.
Authors:
--------
Merlin Hughes
%package -n libsensors4
Summary: Hardware health monitoring library
License: LGPL-2.1+
Group: System/Libraries
%description -n libsensors4
libsensors offers a way for applications to access the hardware
monitoring chips of the system. A system-dependent configuration file
controls how the different inputs are labeled and what scaling factors
have to be applied for the specific hardware, so that the output makes
sense to the user.
Authors:
--------
Mark D. Studebaker
Philip Edelbrock
Ky�sti M�lkki
Frodo Looijaard
Jean Delvare
Mark M. Hoffman
%package -n libsensors4-devel
Summary: Hardware health monitoring library
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: glibc-devel
Requires: libsensors4 = %{version}
Provides: sensors:/usr/include/sensors/sensors.h
Conflicts: libsensors3-devel
%description -n libsensors4-devel
libsensors offers a way for applications to access the hardware
monitoring chips of the system. A system-dependent configuration file
controls how the different inputs are labeled and what scaling factors
have to be applied for the specific hardware, so that the output makes
sense to the user.
Authors:
--------
Mark D. Studebaker
Philip Edelbrock
Ky�sti M�lkki
Frodo Looijaard
Jean Delvare
Mark M. Hoffman
%prep
%setup -q -n lm_sensors-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir}
%install
make PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
cd doc/
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors
cp -a donations $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a fan-divisors $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a fancontrol.txt $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a temperature-sensors $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a vid $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a progs $RPM_BUILD_ROOT/%{_docdir}/sensors/
chmod -R u+rwX,g+rX,o+rX $RPM_BUILD_ROOT/%{_docdir}/sensors/
cd ../
chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
mkdir -p $RPM_BUILD_ROOT/etc/init.d
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
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
cp -a prog/init/*.service $RPM_BUILD_ROOT/%{_unitdir}/
%pre
%service_add_pre lm_sensors.service
%post
%service_add_post lm_sensors.service
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
%service_del_preun lm_sensors.service
%{stop_on_removal lm_sensors}
%postun
%service_del_postun lm_sensors.service
%{insserv_cleanup}
%post -n libsensors4 -p /sbin/ldconfig
%postun -n libsensors4 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_unitdir}/lm_sensors.service
%{_unitdir}/fancontrol.service
/etc/init.d/lm_sensors
/usr/sbin/rclm_sensors
/usr/bin/*
/usr/sbin/fancontrol
%ifarch i386 i486 i586 i686 x86_64
/usr/sbin/isadump
/usr/sbin/isaset
%endif
/usr/sbin/pwmconfig
/usr/sbin/sensors-detect
%doc %{_docdir}/sensors/
%doc /usr/share/man/man1/*.1.gz
%doc /usr/share/man/man8/fancontrol.8.gz
%ifarch i386 i486 i586 i686 x86_64
%doc /usr/share/man/man8/isadump.8.gz
%doc /usr/share/man/man8/isaset.8.gz
%endif
%doc /usr/share/man/man8/pwmconfig.8.gz
%doc /usr/share/man/man8/sensors-detect.8.gz
%files -n sensord
%defattr(-,root,root)
%{_unitdir}/sensord.service
/usr/sbin/sensord
%doc /usr/share/man/man8/sensord.8.gz
%files -n libsensors4
%defattr(-,root,root)
%config /etc/sensors3.conf
%config /etc/sensors.d/
%{_libdir}/libsensors.so.4*
%doc /usr/share/man/man5/*.5.gz
%files -n libsensors4-devel
%defattr(-,root,root)
/usr/include/sensors/
%{_libdir}/libsensors.so
%doc /usr/share/man/man3/*.3.gz
%changelog
++++++ baselibs.conf ++++++
libsensors4
obsoletes "sensors-<targettype> <= <version>"
provides "sensors-<targettype> = <version>"
++++++ lm_sensors-3.0.0-sensord-separate.patch ++++++
--- 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.
+ In Suse Linux, this daemon is packaged separately. You have to explicitly
+ install the package named "sensord" if you want it.
* prog/sensors/sensors (written in C, installed by `make install')
This pretty-prints the information provided by the modules. It is a normal
++++++ lm_sensors-3.0.0-sysconfig_metadata.patch ++++++
---
prog/detect/sensors-detect | 6 ++++++
1 file changed, 6 insertions(+)
--- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
+++ lm_sensors-3.3.2/prog/detect/sensors-detect
@@ -6693,6 +6693,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: ""
+#
# 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 ++++++
Now that the kernel package is split into 3 parts, it is possible
that not all required hwmon drivers are installed on the system when
sensors-detect is being run. Point the user to the kernel-*-extra
package if drivers are found to be missing.
---
prog/detect/sensors-detect | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
--- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
+++ lm_sensors-3.3.2/prog/detect/sensors-detect
@@ -2616,12 +2616,15 @@ sub initialize_conf
# [2] -> SUBLEVEL
# [3] -> EXTRAVERSION
#
-use vars qw(@kernel_version $kernel_arch);
+use vars qw(@kernel_version $kernel_flavor $kernel_arch);
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`);
# We only support kernels >= 2.6.5
@@ -6635,7 +6638,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
@@ -141,7 +141,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-r6181-fix-service-files.patch ++++++
Subject: Fix EnvironmentFile in service files
Upstream: yes, r6181
* EnvironmentFile is mandatory for sensord.
* fancontrol needs no EnvironmentFile.
---
prog/init/fancontrol.service | 1 -
prog/init/sensord.service | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
--- a/prog/init/fancontrol.service
+++ b/prog/init/fancontrol.service
@@ -4,7 +4,6 @@ ConditionFileNotEmpty=/etc/fancontrol
After=lm_sensors.service
[Service]
-EnvironmentFile=/etc/sysconfig/lm_sensors
Type=simple
PIDFile=/var/run/fancontrol.pid
ExecStart=/usr/sbin/fancontrol
--- a/prog/init/sensord.service
+++ b/prog/init/sensord.service
@@ -4,7 +4,7 @@ After=lm_sensors.service
After=syslog.target
[Service]
-EnvironmentFile=-/etc/sysconfig/sensord
+EnvironmentFile=/etc/sysconfig/sensord
Type=forking
PIDFile=/var/run/sensord.pid
ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon
++++++ lm_sensors-r6255-fancontrol-fix-shell-error.patch ++++++
Subject: fancontrol: Fix shell error when FCFANS is not set
Patch-mainline: yes (r6255)
The bug was introduced when I added support for multiple fans
controlled by the same PWM output, in r6000. lm-sensors versions
affected: 3.3.2 to 3.3.5.
This fixes SUSE bug #903520:
https://bugzilla.suse.com/show_bug.cgi?id=903520
---
prog/pwm/fancontrol | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/prog/pwm/fancontrol
+++ b/prog/pwm/fancontrol
@@ -3,7 +3,7 @@
# Simple script implementing a temperature dependent fan speed control
# Supported Linux kernel versions: 2.6.5 and later
#
-# Version 0.70
+# Version 0.71
#
# Usage: fancontrol [CONFIGFILE]
#
@@ -450,7 +450,7 @@ function UpdateFanSpeeds
fi
done
else
- fanval=1 # set it to a non zero value, so the rest of the script still works
+ min_fanval=1 # set it to a non zero value, so the rest of the script still works
fi
# debug info
++++++ lm_sensors-r6282-detect-graphics-card-in-all-cases.patch ++++++
Subject: sensors-detect: Detect graphics card in all cases
Patch-mainline: yes (r6282)
On recent kernels, the i2c bus may not be an immediate child of the
graphics device, instead there can be a drm class device in between.
Treat all drm class devices as graphics devices so that probing the
i2c bus is disabled by default as intended.
---
prog/detect/sensors-detect | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3681,7 +3681,9 @@ sub get_pci_class
my ($subsystem, $class);
$subsystem = sysfs_device_subsystem($device);
- return 0 unless defined $subsystem && $subsystem eq "pci";
+ return 0 unless defined $subsystem;
+ return 0x0300 if $subsystem eq "drm"; # Graphics card
+ return 0 unless $subsystem eq "pci";
$class = sysfs_device_attribute($device, "class");
return 0 unless defined $class;
++++++ lm_sensors-r6283-skip-addresses-0x37-0x4f-on-DDC.patch ++++++
Subject: sensors-detect: Skip addresses 0x37 and 0x4f on DDC channels
Patch-mainline: yes (r6283)
We already skip EDID addresses (0x50-0x57) by default on graphics card
I2C/DDC buses. Also skip 0x37 (DDC/CI) and 0x4f which was recently
reported as corrupting a laptop's display when probed.
---
prog/detect/sensors-detect | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3727,8 +3727,10 @@ sub scan_i2c_adapter
chomp($input);
@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
} elsif (($class & 0xff00) == 0x0300) {
- # Skip EDID addresses by default on graphics adapters
- @not_to_scan = parse_not_to_scan(0x03, 0x77, "0x50-0x57");
+ # Skip EDID and DDC/CI addresses by default on graphics
+ # adapters. Also skip address 0x4f which was reported in a
+ # display corruption case.
+ @not_to_scan = parse_not_to_scan(0x03, 0x77, "0x37, 0x50-0x57, 0x4f");
}
open(local *FILE, "$dev_i2c$adapter_nr") or
++++++ 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/run/lm_sensors.lock
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() {
if test -s "$FANCONFIG" -a -x "$PFAN" ; then
echo -n "Checking for fan control daemon: "
/sbin/checkproc "$PFAN"
rc_status -v
fi
if test -e "$LOCK" ; then
$PSENSORS
else
rc_failed 3
fi
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