Refactor lmsensors to allow machine-specific configuration
cover Refactor lmsensors to allow machine-specific configuration
Hi,
This patchset splits lmsensors configuration files into a separate machine-specific "lmsensors-config" recipe. The main lmsensors recipe can remain machine-agnostic while sensor configuration files can be customized on a per-machine basis by extending the lmsensors-config recipe.
This is useful when targetting multiple machines that share the same CPU architecture but differ in the number or type of sensors available on each. The lmsensors packages can be shared among all the machines, and configuration packages made available on a per-machine basis.
Thomas
Thomas Fitzsimmons (2):
lmsensors-config: Initial commit
lmsensors: Add lmsensors-config RRECOMMENDS
.../recipes-support/lm_sensors/files/fancontrol | 2 - .../recipes-support/lm_sensors/files/fancontrol.sh | 48 ----------------- .../recipes-support/lm_sensors/files/sensord.cgi | 10 ---- .../recipes-support/lm_sensors/files/sensord.conf | 16 ------ .../recipes-support/lm_sensors/files/sensord.sh | 49 ----------------- .../recipes-support/lm_sensors/files/sensors.conf | 2 - .../lm_sensors/lmsensors-config/fancontrol | 2 + .../lm_sensors/lmsensors-config/sensord.cgi | 10 ++++ .../lm_sensors/lmsensors-config/sensord.conf | 16 ++++++ .../lm_sensors/lmsensors-config/sensors.conf | 2 + .../lm_sensors/lmsensors-config_1.0.bb | 50 +++++++++++++++++ .../lm_sensors/lmsensors/fancontrol.init | 48 +++++++++++++++++ .../lm_sensors/lmsensors/sensord.init | 49 +++++++++++++++++ .../recipes-support/lm_sensors/lmsensors_3.3.2.bb | 56 +++++++------------- 14 files changed, 196 insertions(+), 164 deletions(-) delete mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol delete mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol.sh delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.cgi delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.conf delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.sh delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensors.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init
PATCH 1/2 lmsensors-config: Initial commit
lmsensors-config provides lmsensors configuration files. The main lmsensors recipe provides machine-independent parts of lmsensors, while this recipe allows configuration files to be machine-specific.
The packages consist of:
* lmsensors-config-libsensors: libsensors configuration file
* lmsensors-config-sensord: sensord logging daemon configuration files
* lmsensors-config-fancontrol: fancontrol script configuration file
--- .../recipes-support/lm_sensors/files/fancontrol | 2 - .../recipes-support/lm_sensors/files/sensord.cgi | 10 ---- .../recipes-support/lm_sensors/files/sensord.conf | 16 ------ .../recipes-support/lm_sensors/files/sensors.conf | 2 - .../lm_sensors/lmsensors-config/fancontrol | 2 + .../lm_sensors/lmsensors-config/sensord.cgi | 10 ++++ .../lm_sensors/lmsensors-config/sensord.conf | 16 ++++++ .../lm_sensors/lmsensors-config/sensors.conf | 2 + .../lm_sensors/lmsensors-config_1.0.bb | 50 ++++++++++++++++++++ 9 files changed, 80 insertions(+), 30 deletions(-) delete mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.cgi delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.conf delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensors.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
meta-oe/recipes-support/lm_sensors/files/fancontrol deleted +0 -2
@@ -1,2 +0,0 @@ -# fancontrol configuration file. -# Place your device specific configuration in this file.
meta-oe/recipes-support/lm_sensors/files/sensord.cgi deleted +0 -10
@@ -1,10 +0,0 @@ -#!/usr/bin/rrdcgi - -<html> -<head> -<title>sensord</title> -</head> -<body> -Generate a valid sensord.cgi script and install it in your BSP. -</body> -</html>
meta-oe/recipes-support/lm_sensors/files/sensord.conf deleted +0 -16
@@ -1,16 +0,0 @@ -# Default sensord configuration file -# Syntax: sensord {options} {chips} -# -i, --interval <time> -- interval between scanning alarms (default 60s) -# -l, --log-interval <time> -- interval between logging sensors (default 30m) -# -t, --rrd-interval <time> -- interval between updating RRD file (default 5m) -# -T, --rrd-no-average -- switch RRD in non-average mode -# -r, --rrd-file <file> -- RRD file (default <none>) -# -c, --config-file <file> -- configuration file -# -p, --pid-file <file> -- PID file (default /var/run/sensord.pid) -# -f, --syslog-facility <f> -- syslog facility to use (default local4) -# -g, --rrd-cgi <img-dir> -- output an RRD CGI script and exit -# -a, --load-average -- include load average in RRD file -# -d, --debug -- display some debug information -# -v, --version -- display version and exit -# -h, --help -- display help and exit -SENSORD_ARGS="-i60s -l30m -t1m -r/var/lib/sensord.rrd -a"
meta-oe/recipes-support/lm_sensors/files/sensors.conf deleted +0 -2
@@ -1,2 +0,0 @@ -# sensors configuration file. -# Place your device specific configuration in this file.
meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol new file +2 -0
@@ -0,0 +1,2 @@ +# fancontrol configuration file. +# Place your device specific configuration in this file.
meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi new file +10 -0
@@ -0,0 +1,10 @@ +#!/usr/bin/rrdcgi + +<html> +<head> +<title>sensord</title> +</head> +<body> +Generate a valid sensord.cgi script and install it in your BSP. +</body> +</html>
meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf new file +16 -0
@@ -0,0 +1,16 @@ +# Default sensord configuration file +# Syntax: sensord {options} {chips} +# -i, --interval <time> -- interval between scanning alarms (default 60s) +# -l, --log-interval <time> -- interval between logging sensors (default 30m) +# -t, --rrd-interval <time> -- interval between updating RRD file (default 5m) +# -T, --rrd-no-average -- switch RRD in non-average mode +# -r, --rrd-file <file> -- RRD file (default <none>) +# -c, --config-file <file> -- configuration file +# -p, --pid-file <file> -- PID file (default /var/run/sensord.pid) +# -f, --syslog-facility <f> -- syslog facility to use (default local4) +# -g, --rrd-cgi <img-dir> -- output an RRD CGI script and exit +# -a, --load-average -- include load average in RRD file +# -d, --debug -- display some debug information +# -v, --version -- display version and exit +# -h, --help -- display help and exit +SENSORD_ARGS="-i60s -l30m -t1m -r/var/lib/sensord.rrd -a"
meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf new file +2 -0
@@ -0,0 +1,2 @@ +# sensors configuration file. +# Place your device specific configuration in this file.
meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb new file +50 -0
50 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH 2/2 lmsensors: Add lmsensors-config RRECOMMENDS
In reply to Thomas Fitzsimmons--- .../recipes-support/lm_sensors/files/fancontrol.sh | 48 ----------------- .../recipes-support/lm_sensors/files/sensord.sh | 49 ----------------- .../lm_sensors/lmsensors/fancontrol.init | 48 +++++++++++++++++ .../lm_sensors/lmsensors/sensord.init | 49 +++++++++++++++++ .../recipes-support/lm_sensors/lmsensors_3.3.2.bb | 56 +++++++------------- 5 files changed, 116 insertions(+), 134 deletions(-) delete mode 100644 meta-oe/recipes-support/lm_sensors/files/fancontrol.sh delete mode 100644 meta-oe/recipes-support/lm_sensors/files/sensord.sh create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init
meta-oe/recipes-support/lm_sensors/files/fancontrol.sh deleted +0 -48
@@ -1,48 +0,0 @@ -#! /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` - -. /etc/init.d/functions || exit 1 - -# Exit if the package is not installed -[ -x "$FANCONTROL" ] || exit 0 - -case "$1" in - start) - echo -n "Starting $DESC: $NAME... " - /sbin/start-stop-daemon -S -x $FANCONTROL -b -- $FANCONTROL_ARGS - echo "done." - ;; - stop) - echo -n "Stopping $DESC: $NAME... " - /sbin/start-stop-daemon -K -x $FANCONTROL - echo "done." - ;; - restart) - echo "Restarting $DESC: $NAME... " - $0 stop - $0 start - echo "done." - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -exit 0
meta-oe/recipes-support/lm_sensors/files/sensord.sh deleted +0 -49
49 lines not on this page · raw message
meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init new file +48 -0
48 lines not on this page · raw message
meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init new file +49 -0
49 lines not on this page · raw message
meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb +19 -37
111 lines not on this page · raw message
Signature · 1 line
1.6.0.6