OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=41

lm_sensors-3.0.3-hint-at-kernel-extra-package.patch

@@ -0,0 +1,41 @@
+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 |   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
+ # [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`);
+ }
+ 
+@@ -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";
+     }

lm_sensors-r5352-fix-detection-of-ADT7463-and-LM96000.patch

@@ -0,0 +1,20 @@
+--- lm_sensors-3.0.3.orig/prog/detect/sensors-detect
++++ lm_sensors-3.0.3/prog/detect/sensors-detect
+@@ -4522,13 +4522,15 @@ sub lm85_detect
+            && $verstep != 0x62;	# LM85 B
+   } elsif ($chip == 1) {
+     return if $vendor != 0x01;	# National Semiconductor
+-    return if $verstep != 0x68;	# LM96000
++    return if $verstep != 0x68	# LM96000
++           && $verstep != 0x69;	# LM96000
+   } elsif ($chip == 2) {
+     return if $vendor != 0x41;	# Analog Devices
+     return if $verstep != 0x60;	# ADM1027
+   } elsif ($chip == 3) {
+     return if $vendor != 0x41;	# Analog Devices
+-    return if $verstep != 0x62;	# ADT7463
++    return if $verstep != 0x62	# ADT7463
++           && $verstep != 0x6a;	# ADT7463 C
+   } elsif ($chip == 4) {
+     return if $vendor != 0x5c;	# SMSC
+     return if $verstep != 0x60	# EMC6D100/101 A0

lm_sensors-r5366-fix-detection-of-Intel-AMB.patch

@@ -0,0 +1,26 @@
+--- lm_sensors-3.0.3.orig/prog/detect/sensors-detect
++++ lm_sensors-3.0.3/prog/detect/sensors-detect
+@@ -2146,7 +2146,7 @@ use vars qw(@chip_kern24_ids @chip_kern2
+   },
+   {
+     name => "Intel AMB FB-DIMM thermal sensor",
+-    driver => "to-be-written",
++    driver => "i5k_amb",
+     detect => sub { intel_amb_detect(); },
+   },
+   {
+@@ -5647,12 +5647,10 @@ sub k10temp_pci_detect
+ }
+ 
+ # Returns: undef if not detected, (9) if detected.
+-# the device 0xa620 should not be visible on host PCI bus, gateway
+-# must be used
+ sub intel_amb_detect
+ {
+-	if ((exists $pci_list{'8086:a620'}) ||
+-	   (exists $pci_list{'8086:25f0'})) {
++	if ((exists $pci_list{'8086:25f0'}) ||	# Intel 5000
++	    (exists $pci_list{'8086:4030'})) {	# Intel 5400
+ 		return 9;
+ 	}
+ 	return;

sensors.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Oct 22 15:54:17 CEST 2008 - jdelvare@suse.de
+
+- lm_sensors-r5366-fix-detection-of-Intel-AMB.patch: Fix detection
+  of Intel 5000 series FB-DIMM AMB.
+
+-------------------------------------------------------------------
+Tue Oct 14 14:34:53 CEST 2008 - jdelvare@suse.de
+
+- lm_sensors-r5352-fix-detection-of-ADT7463-and-LM96000.patch: Fix
+  detection of ADT7463 and LM96000.
+- 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. (bnc#431555)
+
 -------------------------------------------------------------------
 Sun Sep 28 19:22:34 CEST 2008 - jdelvare@suse.de
 

sensors.spec

@@ -22,7 +22,7 @@ Name:           sensors
 BuildRequires:  bison flex rrdtool-devel
 Url:            http://www.lm-sensors.org/
 Version:        3.0.3
-Release:        2
+Release:        3
 Summary:        Hardware health monitoring for Linux
 License:        GPL v2 or later
 Group:          System/Monitoring
@@ -32,6 +32,9 @@ 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
+Patch4:         lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
+Patch5:         lm_sensors-r5366-fix-detection-of-Intel-AMB.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
 
@@ -132,6 +135,9 @@ Authors:
 %patch
 %patch1
 %patch2
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -207,6 +213,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc /usr/share/man/man3/*.3.gz
 
 %changelog
+* Wed Oct 22 2008 jdelvare@suse.de
+- lm_sensors-r5366-fix-detection-of-Intel-AMB.patch: Fix detection
+  of Intel 5000 series FB-DIMM AMB.
+* Tue Oct 14 2008 jdelvare@suse.de
+- lm_sensors-r5352-fix-detection-of-ADT7463-and-LM96000.patch: Fix
+  detection of ADT7463 and LM96000.
+- 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. (bnc#431555)
 * Sun Sep 28 2008 jdelvare@suse.de
 - Update to lm_sensors 3.0.3
   * Many improvements to pwmconfig