From 3e5266fd0b83f7a0b825864f9d4e3bdd07de051b0c3cab4f485a6781d39f228f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 30 Mar 2011 08:41:17 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/sensors revision 69.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=24a09df49facb7feb4e88b506e35d98e --- sensors.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensors.spec b/sensors.spec index c0aa78e..927b938 100644 --- a/sensors.spec +++ b/sensors.spec @@ -24,7 +24,7 @@ Url: http://www.lm-sensors.org/ Version: 3.3.0 Release: 1 Summary: Hardware health monitoring for Linux -License: GPLv2+/LGPL +License: GPLv2+ Group: System/Monitoring Requires: modules AutoReqProv: on From 028107a3c12db87196a918deaec9e1b2707b7d025e690b380a6c465d0d07b2c4 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 22 Jul 2011 17:03:35 +0000 Subject: [PATCH 2/2] - 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. OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=39 --- lm_sensors-3.1.1-no-ipmisensors-driver.patch | 44 ------------------- lm_sensors-3.3.0.tar.bz2 | 3 -- lm_sensors-3.3.1.tar.bz2 | 3 ++ lm_sensors-r5952-new-fintek-chips.patch | 25 ----------- ...1-improve-filtering-of-fake-DMI-data.patch | 27 ++++++++++++ ...sors-r5992-print-DMI-product-version.patch | 22 ++++++++++ sensors.changes | 10 +++++ sensors.spec | 7 +-- 8 files changed, 66 insertions(+), 75 deletions(-) delete mode 100644 lm_sensors-3.1.1-no-ipmisensors-driver.patch delete mode 100644 lm_sensors-3.3.0.tar.bz2 create mode 100644 lm_sensors-3.3.1.tar.bz2 delete mode 100644 lm_sensors-r5952-new-fintek-chips.patch create mode 100644 lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch create mode 100644 lm_sensors-r5992-print-DMI-product-version.patch diff --git a/lm_sensors-3.1.1-no-ipmisensors-driver.patch b/lm_sensors-3.1.1-no-ipmisensors-driver.patch deleted file mode 100644 index c6ac9c6..0000000 --- a/lm_sensors-3.1.1-no-ipmisensors-driver.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Jean Delvare -Subject: Don't point the user to the ipmisensors driver -References: bnc#558756 - -We do not ship the out-of-tree ipmisensors driver, so do not point -the user to that driver. - ---- - prog/detect/sensors-detect | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- lm_sensors-3.3.0.orig/prog/detect/sensors-detect -+++ lm_sensors-3.3.0/prog/detect/sensors-detect -@@ -1351,12 +1351,12 @@ use vars qw(@i2c_adapter_names); - @ipmi_ifs = ( - { - name => "IPMI BMC KCS", -- driver => "ipmisensors", -+ driver => "to-be-written", - isa_addrs => [0x0ca0], - isa_detect => sub { ipmi_detect(@_); }, - }, { - name => "IPMI BMC SMIC", -- driver => "ipmisensors", -+ driver => "to-be-written", - isa_addrs => [0x0ca8], - isa_detect => sub { ipmi_detect(@_); }, - } -@@ -6023,13 +6023,13 @@ sub ipmi_from_smbios - $if->{type})); - } - print "Success!\n". -- " (confidence 8, driver `ipmisensors')\n"; -+ " (confidence 8, driver `to-be-written')\n"; - my $new_hash = { - conf => 8, - isa_addr => $if->{addr} || 0, - chipname => $if->{type}, - }; -- add_isa_to_chips_detected("ipmisensors", $new_hash); -+ add_isa_to_chips_detected("to-be-written", $new_hash); - } - - return scalar @ipmi_if; diff --git a/lm_sensors-3.3.0.tar.bz2 b/lm_sensors-3.3.0.tar.bz2 deleted file mode 100644 index ef0773c..0000000 --- a/lm_sensors-3.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:145c222e4611cedb2d16efb2700164f599297b2124c4dc30af4fc89c417cc20f -size 169020 diff --git a/lm_sensors-3.3.1.tar.bz2 b/lm_sensors-3.3.1.tar.bz2 new file mode 100644 index 0000000..abeecb7 --- /dev/null +++ b/lm_sensors-3.3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfcc783945f7bfd5206e73f8f9d3f353b0dbf22153c0ef2587a8d7a7be7e628f +size 170156 diff --git a/lm_sensors-r5952-new-fintek-chips.patch b/lm_sensors-r5952-new-fintek-chips.patch deleted file mode 100644 index 0cdfe15..0000000 --- a/lm_sensors-r5952-new-fintek-chips.patch +++ /dev/null @@ -1,25 +0,0 @@ -We have support for the Fintek F71889A and F81865F now. ---- - prog/detect/sensors-detect | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- lm_sensors-3.3.0.orig/prog/detect/sensors-detect -+++ lm_sensors-3.3.0/prog/detect/sensors-detect -@@ -1993,7 +1993,7 @@ use constant FEAT_SMBUS => (1 << 7); - features => FEAT_IN | FEAT_FAN | FEAT_TEMP, - }, { - name => "Fintek F71889A Super IO Sensors", -- driver => "to-be-written", -+ driver => "f71882fg", - devid => 0x1005, - logdev => 0x04, - features => FEAT_IN | FEAT_FAN | FEAT_TEMP, -@@ -2007,7 +2007,7 @@ use constant FEAT_SMBUS => (1 << 7); - devid => 0x0206, - }, { - name => "Fintek F81865F Super IO Sensors", -- driver => "to-be-written", -+ driver => "f71882fg", - devid => 0x0704, - logdev => 0x04, - features => FEAT_IN | FEAT_FAN | FEAT_TEMP, diff --git a/lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch b/lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch new file mode 100644 index 0000000..7f74a8b --- /dev/null +++ b/lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch @@ -0,0 +1,27 @@ +--- + prog/detect/sensors-detect | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- lm_sensors-3.3.1.orig/prog/detect/sensors-detect ++++ lm_sensors-3.3.1/prog/detect/sensors-detect +@@ -2767,8 +2767,9 @@ sub initialize_dmi_data + ); + # Many BIOS have broken DMI data, filter it out + my %fake = ( +- 'System Manufacturer' => 1, +- 'System Name' => 1, ++ 'system manufacturer' => 1, ++ 'system product name' => 1, ++ 'system name' => 1, + ); + my $dmi_id_dir; + +@@ -2797,7 +2798,7 @@ sub initialize_dmi_data + next; + } + $dmi{$k} =~ s/\s*$//; +- delete $dmi{$k} if $dmi{$k} eq '' || exists $fake{$dmi{$k}}; ++ delete $dmi{$k} if $dmi{$k} eq '' || exists $fake{lc($dmi{$k})}; + } + } + diff --git a/lm_sensors-r5992-print-DMI-product-version.patch b/lm_sensors-r5992-print-DMI-product-version.patch new file mode 100644 index 0000000..a27fe04 --- /dev/null +++ b/lm_sensors-r5992-print-DMI-product-version.patch @@ -0,0 +1,22 @@ +--- + prog/detect/sensors-detect | 2 ++ + 1 file changed, 2 insertions(+) + +--- lm_sensors-3.3.1.orig/prog/detect/sensors-detect ++++ lm_sensors-3.3.1/prog/detect/sensors-detect +@@ -2770,6 +2770,7 @@ sub initialize_dmi_data + 'system manufacturer' => 1, + 'system product name' => 1, + 'system name' => 1, ++ 'system version' => 1, + ); + my $dmi_id_dir; + +@@ -2814,6 +2815,7 @@ sub print_dmi_summary + + if (defined $system) { + print "# System: $system"; ++ print " [$dmi{product_version}]" if defined $dmi{product_version}; + print " (laptop)" if (is_laptop()); + print "\n"; + } diff --git a/sensors.changes b/sensors.changes index 0250918..c8eaeb9 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/sensors.spec b/sensors.spec index 927b938..ba0e2eb 100644 --- a/sensors.spec +++ b/sensors.spec @@ -21,7 +21,7 @@ Name: sensors BuildRequires: bison flex rrdtool-devel Url: http://www.lm-sensors.org/ -Version: 3.3.0 +Version: 3.3.1 Release: 1 Summary: Hardware health monitoring for Linux License: GPLv2+ @@ -35,8 +35,9 @@ 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-3.1.1-no-ipmisensors-driver.patch -Patch6: lm_sensors-r5952-new-fintek-chips.patch +Patch5: lm_sensors-r5991-improve-filtering-of-fake-DMI-data.patch +Patch6: lm_sensors-r5992-print-DMI-product-version.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x