mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

lmsensors: sensors-detect: print a special message when there isn't enough cpu info

Browse Source 
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.

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Li Zhou
2016-09-07 09:46:29 +08:00
committed by Martin Jansa
parent 35ee0a0493
commit d505a7aa72
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch
+40
View File
@@ -0,0 +1,40 @@
From c4428260e7685ebaf5c26c6ecaae5a56849853e8 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] 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 3c2b44f..5f62405 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -2864,7 +2864,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
--
1.9.1
meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb
+1
View File
@@ -10,6 +10,7 @@ DEPENDS = "sysfsutils virtual/libiconv bison-native flex-native rrdtool"
SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.bz2 \ SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.bz2 \
file://fancontrol.init \ file://fancontrol.init \
file://sensord.init \ file://sensord.init \
file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \
" "
SRC_URI[md5sum] = "c03675ae9d43d60322110c679416901a" SRC_URI[md5sum] = "c03675ae9d43d60322110c679416901a"
SRC_URI[sha256sum] = "e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f" SRC_URI[sha256sum] = "e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f"