- Update to lm_sensors 3.3.5

* library: Support up to 33 sensors of the same type per
    monitoring chip (needed for recent Intel processors, coretemp
    driver)
  * sensors-detect: Detection of new devices
      Added non-interactive (automatic) mode
  * lm_sensors-r6181-fix-service-files.patch: Removed, upstream
    now.
  * lm_sensors-3.0.0-sysconfig_metadata.patch,
    lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.

OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=72
This commit is contained in:
Jean Delvare 2014-01-22 09:14:43 +00:00 committed by Git OBS Bridge
parent 35aaaa2b69
commit d5963e1ab3
6 changed files with 33 additions and 24 deletions

View File

@ -4,7 +4,7 @@
--- 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
@@ -6784,6 +6784,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';

View File

@ -3,21 +3,22 @@ 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(-)
prog/detect/sensors-detect | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- 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
@@ -2669,13 +2669,16 @@ sub initialize_conf
# [2] -> SUBLEVEL
# [3] -> EXTRAVERSION
#
-use vars qw(@kernel_version $kernel_arch);
+use vars qw(@kernel_version $kernel_flavor $kernel_arch);
-use vars qw($kernel_version @kernel_version $kernel_arch);
+use vars qw($kernel_version @kernel_version $kernel_flavor $kernel_arch);
sub initialize_kernel_version
{
`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
chomp($kernel_version = `uname -r`);
$kernel_version =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
@kernel_version = ($1, $2, $3, $4);
+ if ($kernel_version[3] =~ /-([a-z]+)$/) {
+ chomp($kernel_flavor = $1);
@ -25,16 +26,12 @@ package if drivers are found to be missing.
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) {
@@ -6729,6 +6732,8 @@ sub generate_modprobes
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".
"on your system. Check http://www.lm-sensors.org/wiki/Devices for\n".
"driver availability.\n\n";
+ print "You may need to install package kernel-$kernel_flavor-extra for\n".
+ "lm-sensors to work properly.\n\n" if $kernel_flavor;
} else {
$hwmon_modules{$driver}++
unless hwmon_is_autoloaded($driver);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4608610cb5de4b24e3fe1ae357712e8633a8a929bbb42df5eecc4ccee6ba76d
size 172226

3
lm_sensors-3.3.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5dae6a665e1150159a93743c4ff1943a7efe02cd9d3bb12c4805e7d7adcf4fcf
size 173609

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Jan 22 10:08:21 CET 2014 - jdelvare@suse.de
- Update to lm_sensors 3.3.5
* library: Support up to 33 sensors of the same type per
monitoring chip (needed for recent Intel processors, coretemp
driver)
* sensors-detect: Detection of new devices
Added non-interactive (automatic) mode
* lm_sensors-r6181-fix-service-files.patch: Removed, upstream
now.
* lm_sensors-3.0.0-sysconfig_metadata.patch,
lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.
-------------------------------------------------------------------
Wed Oct 23 15:38:06 UTC 2013 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package sensors
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -22,7 +22,7 @@ BuildRequires: flex
BuildRequires: rrdtool-devel
BuildRequires: systemd-rpm-macros
Url: http://www.lm-sensors.org/
Version: 3.3.4
Version: 3.3.5
Release: 0
Summary: Hardware health monitoring for Linux
License: GPL-2.0+
@ -34,7 +34,6 @@ 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
ExcludeArch: s390 s390x
%{?systemd_requires}
@ -95,7 +94,6 @@ sense to the user.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"