Hello community, here is the log from the commit of package sensors for openSUSE:Factory checked in at 2016-10-14 09:27:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sensors (Old) and /work/SRC/openSUSE:Factory/.sensors.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sensors" Changes: -------- --- /work/SRC/openSUSE:Factory/sensors/sensors.changes 2016-09-09 10:15:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sensors.new/sensors.changes 2016-10-14 09:27:11.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 5 06:44:24 UTC 2016 - [email protected] + +- lm_sensors-3.4.0-sensors-detect-ppc64le.patch: Fix sensors-detect + CPU detection support on ppc architectures. + +------------------------------------------------------------------- New: ---- lm_sensors-3.4.0-sensors-detect-ppc64le.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.41U1Iv/_old 2016-10-14 09:27:12.000000000 +0200 +++ /var/tmp/diff_new_pack.41U1Iv/_new 2016-10-14 09:27:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sensors # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,8 @@ 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 ExcludeArch: s390 s390x %{?systemd_requires} @@ -104,6 +106,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ lm_sensors-3.4.0-sensors-detect-ppc64le.patch ++++++ From: Jean Delvare <[email protected]> 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
