From 27fec358df3ea07a39a5ba62ead85e353e9b4f13a4b4bc3cfe6aa4e99b3a8eb5 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 3 Dec 2019 10:57:26 +0000 Subject: [PATCH] Accepting request 753124 from home:Smar:lm-sensors - Removed upstreamed patch lm_sensors-3.4.0-sensors-detect-ppc64le.patch - Update to version 3.6.0: + configs: Added a number of new configuration files + fancontrol: AVERAGE env variable can be used to set the number of previous readings to average + Makefile: The MACHINE variable has been renamed to ARCH + sensord: Add an option -1/--oneline to print chip and adapter on the same line + sensors: Fixed a stray comma bug in the JSON output * Fixed Fahrenheit conversion with raw and JSON output * Scale voltage and current values in the default output format + sensors-detect: Add detection of AMD Family 17h, models 30h, 70h * Add detection of some AMD Family 15h models * Add detection of AMD Family 16h model 30h power sensors * Add detection of Hygon Family 18h thermal sensors * Add detection of Nuvoton NCT6797D * Add detection of Nuvoton NCT6798D * Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D * Fix printing CPU info on non-x86 arches * Fix printing lm_sensors version * Mark Fintek F75387SG/RG as supported by the f75375s driver OBS-URL: https://build.opensuse.org/request/show/753124 OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=110 --- lm-sensors-3-5-0.tar.gz | 3 -- lm-sensors-3-6-0.tar.gz | 3 ++ lm_sensors-3.4.0-sensors-detect-ppc64le.patch | 35 ------------------- sensors.changes | 23 ++++++++++++ sensors.spec | 13 +++---- 5 files changed, 31 insertions(+), 46 deletions(-) delete mode 100644 lm-sensors-3-5-0.tar.gz create mode 100644 lm-sensors-3-6-0.tar.gz delete mode 100644 lm_sensors-3.4.0-sensors-detect-ppc64le.patch diff --git a/lm-sensors-3-5-0.tar.gz b/lm-sensors-3-5-0.tar.gz deleted file mode 100644 index ea6a420..0000000 --- a/lm-sensors-3-5-0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0 -size 267133 diff --git a/lm-sensors-3-6-0.tar.gz b/lm-sensors-3-6-0.tar.gz new file mode 100644 index 0000000..203bedf --- /dev/null +++ b/lm-sensors-3-6-0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 +size 273209 diff --git a/lm_sensors-3.4.0-sensors-detect-ppc64le.patch b/lm_sensors-3.4.0-sensors-detect-ppc64le.patch deleted file mode 100644 index 2156bef..0000000 --- a/lm_sensors-3.4.0-sensors-detect-ppc64le.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Jean Delvare -Subject: sensors-detect: Report proper processor information on ppc -References: bsc#999987 - -The format of /proc/cpuinfo on ppc differs from the x86 format. Add -the missing pieces to the parsing code so that ppc processor -information is reported properly. ---- - prog/detect/sensors-detect | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -2864,7 +2864,7 @@ sub initialize_cpu_list - }; - next; - } -- if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) { -+ if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level|cpu|revision)\s*:\s*(.+)$/) { - my $k = $1; - my $v = $2; - $v =~ s/\s+/ /g; # Merge multiple spaces -@@ -2880,7 +2880,11 @@ sub initialize_cpu_list - sub print_cpu_info - { - my $cpu = $cpu[0]; -- print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ if (defined $cpu->{'model name'}) { -+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ } elsif (defined $cpu->{'cpu'}) { # ppc -+ print "# Processor: $cpu->{'cpu'}, revision $cpu->{'revision'}\n"; -+ } - } - - # @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus diff --git a/sensors.changes b/sensors.changes index e713450..e9b44c7 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Tue Dec 3 08:30:17 UTC 2019 - Samu Voutilainen + +- Removed upstreamed patch lm_sensors-3.4.0-sensors-detect-ppc64le.patch +- Update to version 3.6.0: + + configs: Added a number of new configuration files + + fancontrol: AVERAGE env variable can be used to set the number of previous readings to average + + Makefile: The MACHINE variable has been renamed to ARCH + + sensord: Add an option -1/--oneline to print chip and adapter on the same line + + sensors: Fixed a stray comma bug in the JSON output + * Fixed Fahrenheit conversion with raw and JSON output + * Scale voltage and current values in the default output format + + sensors-detect: Add detection of AMD Family 17h, models 30h, 70h + * Add detection of some AMD Family 15h models + * Add detection of AMD Family 16h model 30h power sensors + * Add detection of Hygon Family 18h thermal sensors + * Add detection of Nuvoton NCT6797D + * Add detection of Nuvoton NCT6798D + * Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D + * Fix printing CPU info on non-x86 arches + * Fix printing lm_sensors version + * Mark Fintek F75387SG/RG as supported by the f75375s driver + ------------------------------------------------------------------- Sun Mar 3 19:32:47 UTC 2019 - Jan Engelhardt diff --git a/sensors.spec b/sensors.spec index a08d1cd..7c033d0 100644 --- a/sensors.spec +++ b/sensors.spec @@ -1,7 +1,7 @@ # # spec file for package sensors # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,18 +19,18 @@ #%%define commit 1c48b191c8a2b9fc747e3db3816247c666c5c3f1 #%%define shortcommit 1c48b19 %define _name lm-sensors -%define _version 3-5-0 +%define _version 3-6-0 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: sensors -Version: 3.5.0 +Version: 3.6.0 Release: 0 Summary: Hardware health monitoring for Linux License: GPL-2.0-or-later Group: System/Monitoring -Url: https://github.com/lm-sensors/%{_name} +URL: https://github.com/lm-sensors/%{_name} Source0: https://github.com/lm-sensors/%{_name}/archive/V%{_version}.tar.gz#/%{_name}-%{_version}.tar.gz #Source0: https://github.com/groeck/lm-sensors/archive/%%{commit}/%%{_name}-%%{shortcommit}.tar.gz Source1: sysconfig.sensord @@ -42,9 +42,7 @@ Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch Patch6: lm_sensors-3.4.0-sensord-service-extra-args.patch #PATCH-FEATURE-UPSTREAM add ftsteutates support Patch7: lm_sensors-3.4.0-sensors-detect-add-ftsteutates-support.patch -#PATCH-BUGFIX-UPSTREAM sensors-detect on ppc -Patch8: lm_sensors-3.4.0-sensors-detect-ppc64le.patch -Patch9: lm_sensors-3.5.0-libsensors-fix-soname.patch +Patch8: lm_sensors-3.5.0-libsensors-fix-soname.patch BuildRequires: bison BuildRequires: flex BuildRequires: rrdtool-devel @@ -113,7 +111,6 @@ sense to the user. %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %build RPM_OPT_FLAGS="%{optflags}"