Accepting request 50197 from Base:System

checked in (request 50197)

OBS-URL: https://build.opensuse.org/request/show/50197
OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=27

lm_sensors-3.0.0-sysconfig_metadata.patch

@@ -1,6 +1,6 @@
 --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
 +++ lm_sensors-3.1.1/prog/detect/sensors-detect
-@@ -6015,6 +6015,12 @@ sub write_config
+@@ -5709,6 +5709,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';

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

@@ -8,7 +8,7 @@ package if drivers are found to be missing.
 
 --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
 +++ lm_sensors-3.1.1/prog/detect/sensors-detect
-@@ -2253,12 +2253,15 @@ sub initialize_conf
+@@ -2129,12 +2129,15 @@ sub initialize_conf
  # [2] -> SUBLEVEL
  # [3] -> EXTRAVERSION
  #
@@ -25,7 +25,7 @@ package if drivers are found to be missing.
  	chomp($kernel_arch = `uname -m`);
  
  	# We only support kernels >= 2.6.5
-@@ -5957,7 +5960,11 @@ sub generate_modprobes
+@@ -5651,7 +5654,11 @@ sub generate_modprobes
  			# isn't supported
  			if ((($? >> 8) == 0) && ! $modulefound) {
  				print "Warning: the required module $driver is not currently installed\n".

lm_sensors-3.1.1-no-ipmisensors-driver.patch

@@ -7,7 +7,7 @@ the user to that driver.
 
 --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
 +++ lm_sensors-3.1.1/prog/detect/sensors-detect
-@@ -1256,12 +1256,12 @@ use vars qw(@i2c_adapter_names);
+@@ -1166,12 +1166,12 @@ use vars qw(@i2c_adapter_names);
  @ipmi_ifs = (
  	{
  		name => "IPMI BMC KCS",
@@ -22,7 +22,7 @@ the user to that driver.
  		isa_addrs => [0x0ca8],
  		isa_detect => sub { ipmi_detect(@_); },
  	}
-@@ -5639,13 +5639,13 @@ sub ipmi_from_smbios
+@@ -5334,13 +5334,13 @@ sub ipmi_from_smbios
  						 $if->{type}));
  		}
  		print "Success!\n".

lm_sensors-3.1.2.tar.bz2

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

lm_sensors-3.2.0.tar.bz2

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

lm_sensors-r5832-adt7468-driver.patch

@@ -0,0 +1,16 @@
+The ADT7467/8 is supported by the lm85 driver since kernel 2.6.28.
+---
+ prog/detect/sensors-detect |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- lm_sensors-3.1.2.orig/prog/detect/sensors-detect
++++ lm_sensors-3.1.2/prog/detect/sensors-detect
+@@ -558,7 +558,7 @@ use vars qw(@i2c_adapter_names);
+ 		i2c_detect => sub { adt7467_detect(@_, 3); },
+ 	}, {
+ 		name => "Analog Devices ADT7467 or ADT7468",
+-		driver => "to-be-written",
++		driver => "lm85",
+ 		i2c_addrs => [0x2e],
+ 		i2c_detect => sub { adt7467_detect(@_, 0); },
+ 	}, {

lm_sensors-r5835-fix-sensord-regression.patch

@@ -0,0 +1,55 @@
+Fix support of multiple chips.
+
+Index: lm-sensors/prog/sensord/rrd.c
+===================================================================
+--- lm-sensors/prog/sensord/rrd.c	(revision 5793)
++++ lm-sensors/prog/sensord/rrd.c	(revision 5835)
+@@ -138,7 +138,9 @@
+ }
+ 
++/* Returns the number of features processed, or -1 on error */
+ static int _applyToFeatures(FeatureFN fn, void *data,
+ 			    const sensors_chip_name *chip,
+-			    const ChipDescriptor *desc)
++			    const ChipDescriptor *desc,
++			    int labelOffset)
+ {
+ 	int i;
+@@ -148,5 +150,5 @@
+ 	char *label;
+ 
+-	for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {
++	for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {
+ 		feature = features + i;
+ 		rawLabel = feature->feature->name;
+@@ -159,9 +161,9 @@
+ 		}
+ 
+-		rrdCheckLabel(rawLabel, i);
+-		fn(data, rrdLabels[i], label, feature);
++		rrdCheckLabel(rawLabel, labelOffset + i);
++		fn(data, rrdLabels[labelOffset + i], label, feature);
+ 		free(label);
+ 	}
+-	return 0;
++	return i;
+ }
+ 
+@@ -185,5 +187,5 @@
+ static int applyToFeatures(FeatureFN fn, void *data)
+ {
+-	int i, i_detected, ret;
++	int i, i_detected, ret, labelOffset = 0;
+ 	const sensors_chip_name *chip, *chip_arg;
+ 	ChipDescriptor *desc;
+@@ -198,7 +200,8 @@
+ 				continue;
+ 
+-			ret = _applyToFeatures(fn, data, chip, desc);
+-			if (ret)
++			ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
++			if (ret < 0)
+ 				return ret;
++			labelOffset += ret;
+ 		}
+ 	}

lm_sensors-r5837-fix-fam10-RB-C3-detection.patch

@@ -0,0 +1,19 @@
+Fix detection of RB-C3 AMD Family 10h CPU. This core is only used in
+packages not affected by erratum 319, so we don't have to use the
+unreliable DDR2 vs. DDR3 approach for it.
+
+---
+ prog/detect/sensors-detect |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- lm_sensors-3.1.2.orig/prog/detect/sensors-detect
++++ lm_sensors-3.1.2/prog/detect/sensors-detect
+@@ -5425,7 +5425,7 @@ sub fam10h_pci_detect
+ 
+ 		next if $probecpu->{model} < 4;		# DR-B*
+ 		next if $probecpu->{model} == 8;	# HY-D0
+-		if ($probecpu->{model} == 4) {		# RB-C*
++		if ($probecpu->{model} == 4 && $probecpu->{stepping} <= 2) {	# RB-C2
+ 			my @dram_cfg = split /\n/, `setpci -d 1022:1202 94.L 2>/dev/null`;
+ 			next unless @dram_cfg >= 1;
+ 			next unless hex($dram_cfg[0]) & 0x00000100;	# DDR3

sensors.changes

@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Mon Oct 11 08:47:33 CEST 2010 - jdelvare@suse.de
-
-- Update to lm_sensors 3.2.0
-  * The libsensors library is now released under the LGPL license
-  * Minor fixes to libsensors, pwmconfig, sensors and sensord
-  * New chips known by sensors-detect, as usual
-- Don't build the static library in the first place, so we don't
-  have to delete it later.
-
 -------------------------------------------------------------------
 Tue Jun  1 14:46:23 CEST 2010 - jdelvare@suse.de
 

sensors.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package sensors (Version 3.2.0)
+# spec file for package sensors (Version 3.1.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,8 +21,8 @@
 Name:           sensors
 BuildRequires:  bison flex rrdtool-devel
 Url:            http://www.lm-sensors.org/
-Version:        3.2.0
+Version:        3.1.2
-Release:        1
+Release:        5
 Summary:        Hardware health monitoring for Linux
 License:        GPLv2+
 Group:          System/Monitoring
@@ -36,6 +36,9 @@ 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-3.1.1-no-ipmisensors-driver.patch
+Patch6:         lm_sensors-r5832-adt7468-driver.patch
+Patch7:         lm_sensors-r5835-fix-sensord-regression.patch
+Patch8:         lm_sensors-r5837-fix-fam10-RB-C3-detection.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
 
@@ -81,7 +84,7 @@ Authors:
     Merlin Hughes <merlin@merlin.org>
 
 %package -n libsensors4
-License:        LGPLv2.1+
+License:        GPLv2+
 Summary:        Hardware health monitoring library
 Group:          System/Libraries
 AutoReqProv:    on
@@ -105,7 +108,7 @@ Authors:
     Mark M. Hoffman    <mhoffman@lightlink.com>
 
 %package -n libsensors4-devel
-License:        LGPLv2.1+
+License:        GPLv2+
 Summary:        Hardware health monitoring library
 Group:          Development/Libraries/C and C++
 Requires:       libsensors4 = %{version} glibc-devel
@@ -138,13 +141,16 @@ Authors:
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-make %{?jobs:-j%jobs} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir}
+make %{?jobs:-j%jobs} PROG_EXTRA:=sensord PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir} user
 
 %install
-    make PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
+    make PROG_EXTRA:=sensord 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/
@@ -159,6 +165,9 @@ make %{?jobs:-j%jobs} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix}
     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
+# cleanup
+rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
+rm -f %{buildroot}%{_libdir}/libsensors.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT