mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 02:31:27 +00:00
Code Issues Projects Releases Wiki Activity

lmsensors: upgrade 3.5.0 -> 3.6.0

Browse Source 
1) Upgrade lmsensors from 3.5.0 to 3.6.0.

2) Remove two patches for their function have been included in new version.
   0001-lmsensors-sensors-detect-print-a-special-message-whe.patch
   0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zheng Ruoqin
2019-10-31 23:15:54 +08:00
committed by Khem Raj
parent de9cd1661f
commit 63b4f565b3
3 changed files with 1 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch
-40
View File
@@ -1,40 +0,0 @@
From 05a4d54e2adc4caed507baca529089ec01f48340 Mon Sep 17 00:00:00 2001
From: Li Zhou <li.zhou@windriver.com>
Date: Tue, 6 Sep 2016 14:04:29 +0800
Subject: [PATCH 1/2] lmsensors: sensors-detect: print a special message when
there isn't enough cpu info
When running sensors-detect, if there isn't enough information in
/proc/cpuinfo for this arch (e.g. ppc64), "Use of uninitialized value
in concatenation (.) or string at /usr/sbin/sensors-detect line 2867"
and incomplete "# Processor: (//)" will be printed.
Here print out a prompt for such a case.
Upstream-Status: Pending
Signed-off-by: Li Zhou <li.zhou@windriver.com>
---
prog/detect/sensors-detect | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 0b3b0ff2..68594cd7 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3119,7 +3119,12 @@ 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 ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) {
+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n";
+ }
+ else {
+ print "# Processor: There isn't enough cpu info for this arch!!!\n";
+ }
}
# @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus
--
2.21.0
meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch
-74
View File
@@ -1,74 +0,0 @@
From 26742544bc9f136093b6be78259f4a891870aa3c Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com>
Date: Wed, 21 Sep 2016 03:17:32 -0400
Subject: [PATCH 2/2] lm-sensors: fix sensors-detect can't read the cpu
information on fsl-t4xxx
This is because two reasons:
1. The sensors-detect program in lm-sensors depends on the file '/proc/cpuinfo',
different arch write different infomation to it. That program supports x86
and x86-64 well, but weak on ppc and arm.
2. The sensors-detect program show the cpu information just design for intel's
cpu, when meets other arch, it can't output the correct information.
So we need to add the ppc and arm support for this program:
1. add the ppc cpu information field 'cpu' in initialize_cpu_list function.
2. add the correspond case of ppc and arm when print cpu information in
print_cpu_info function.
Upstream-Status: Pending
Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
prog/detect/sensors-detect | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 68594cd7..efe2c1af 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3088,6 +3088,7 @@ sub kernel_version_at_least
# model name and stepping, directly taken from /proc/cpuinfo.
use vars qw(@cpu);
+# The added field 'cpu' is for support the ppc.
sub initialize_cpu_list
{
local $_;
@@ -3103,7 +3104,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
@@ -3116,12 +3117,20 @@ sub initialize_cpu_list
push @cpu, $entry if scalar keys(%{$entry}); # Last entry
}
+# The field 'model name' is for ARM.
+# The field 'cpu' is for ppc.
sub print_cpu_info
{
my $cpu = $cpu[0];
if ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) {
print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n";
}
+ elsif ( $cpu->{'model name'} ) {
+ print "# Processor: $cpu->{'model name'}\n";
+ }
+ elsif ( $cpu->{'cpu'} && $cpu->{'revision'} ) {
+ print "# Processor: $cpu->{'cpu'} $cpu->{'revision'}\n";
+ }
else {
print "# Processor: There isn't enough cpu info for this arch!!!\n";
}
--
2.21.0
meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb → meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
+1 -3
View File
@@ -14,10 +14,8 @@ DEPENDS = " \
SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \
file://fancontrol.init \
file://sensord.init \
file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \
file://0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch \
"
SRCREV = "e8afbda10fba571c816abddcb5c8180afc435bba"
SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
inherit update-rc.d systemd