From 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd Mon Sep 17 00:00:00 2001 From: ToshikazuOhiwa Date: Mon, 30 Mar 2020 09:24:26 +0900 Subject: agl-basesystem --- ...ensors-detect-print-a-special-message-whe.patch | 40 ++++++++++ ...-limit-sys-io.h-header-include-to-just-gl.patch | 88 ++++++++++++++++++++++ .../lm_sensors/lmsensors/fancontrol.init | 47 ++++++++++++ .../recipes-bsp/lm_sensors/lmsensors/sensord.init | 49 ++++++++++++ 4 files changed, 224 insertions(+) create mode 100644 external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init create mode 100644 external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init (limited to 'external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors') diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch new file mode 100644 index 00000000..abf6e752 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch @@ -0,0 +1,40 @@ +From c4428260e7685ebaf5c26c6ecaae5a56849853e8 Mon Sep 17 00:00:00 2001 +From: Li Zhou +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 +--- + 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 + diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch new file mode 100644 index 00000000..fb3878dc --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch @@ -0,0 +1,88 @@ +From 727524453f115ddc05109e9bbb3d0e60a7db9185 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 16 Jul 2017 15:05:50 -0700 +Subject: [PATCH] prog: Do not limit sys/io.h header include to just glibc + +musl provides it too. + +Signed-off-by: Khem Raj +--- + prog/dump/isadump.c | 6 ------ + prog/dump/isaset.c | 6 ------ + prog/dump/superio.c | 5 ----- + prog/dump/util.c | 5 ----- + 4 files changed, 22 deletions(-) + +diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c +index e0e6f00..8794537 100644 +--- a/prog/dump/isadump.c ++++ b/prog/dump/isadump.c +@@ -36,13 +36,7 @@ + #include "util.h" + #include "superio.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c +index e743755..85a4f64 100644 +--- a/prog/dump/isaset.c ++++ b/prog/dump/isaset.c +@@ -32,13 +32,7 @@ + #include + #include "util.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +diff --git a/prog/dump/superio.c b/prog/dump/superio.c +index 64ef27b..906fe55 100644 +--- a/prog/dump/superio.c ++++ b/prog/dump/superio.c +@@ -20,12 +20,7 @@ + */ + + #include +- +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + #include "superio.h" + +diff --git a/prog/dump/util.c b/prog/dump/util.c +index 874c1b9..197fa64 100644 +--- a/prog/dump/util.c ++++ b/prog/dump/util.c +@@ -11,12 +11,7 @@ + #include + #include "util.h" + +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include +-#else +-#include +-#endif + + /* Return 1 if we should continue, 0 if we should abort */ + int user_ack(int def) +-- +2.13.3 + diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init new file mode 100644 index 00000000..4433020b --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init @@ -0,0 +1,47 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: fancontrol +# Required-Start: $local_fs +# Should-Start: +# Required-Stop: $local_fs +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: fancontrol initscript +# Description: Starts and controls the fancontrol daemon +### END INIT INFO + +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +DESC="fan control daemon" +NAME="fancontrol" +FANCONTROL=`which $NAME` +PIDFILE="/var/run/fancontrol.pid" + +# Exit if the package is not installed +[ -x "$FANCONTROL" ] || exit 0 + +case "$1" in + start) + echo -n "Starting $DESC: $NAME... " + start-stop-daemon -S -p $PIDFILE -b -x $FANCONTROL + echo "done." + ;; + stop) + echo -n "Stopping $DESC: $NAME... " + start-stop-daemon -K -p $PIDFILE + echo "done." + ;; + restart) + echo "Restarting $DESC: $NAME... " + $0 stop + $0 start + echo "done." + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 diff --git a/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init new file mode 100644 index 00000000..5a09cd3c --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init @@ -0,0 +1,49 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: sensord +# Required-Start: $local_fs +# Should-Start: +# Required-Stop: $local_fs +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: sensord initscript +# Description: Starts the sensord logging daemon +### END INIT INFO + +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +DESC="sensors logging daemon" +NAME="sensord" +SENSORD=`which $NAME` + +. /etc/init.d/functions || exit 1 +. /etc/sensord.conf || exit 1 + +# Exit if the package is not installed +[ -x "$SENSORD" ] || exit 0 + +case "$1" in + start) + echo -n "Starting $DESC: $NAME... " + start-stop-daemon -S -x $SENSORD -- $SENSORD_ARGS + echo "done." + ;; + stop) + echo -n "Stopping $DESC: $NAME... " + start-stop-daemon -K -x $SENSORD + echo "done." + ;; + restart) + echo "Restarting $DESC: $NAME... " + $0 stop + $0 start + echo "done." + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 -- cgit 1.2.3-korg