* [meta-oe][PATCH 0/2] Refactor lmsensors to allow machine-specific configuration
@ 2013-02-07 20:29 Thomas Fitzsimmons
2013-02-08 0:13 ` [meta-oe][PATCH 1/2] lmsensors-config: Initial commit Thomas Fitzsimmons
2013-02-08 0:14 ` [meta-oe][PATCH 2/2] lmsensors: Add lmsensors-config RRECOMMENDS Thomas Fitzsimmons
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Fitzsimmons @ 2013-02-07 20:29 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [meta-oe][PATCH 1/2] lmsensors-config: Initial commit
2013-02-07 20:29 [meta-oe][PATCH 0/2] Refactor lmsensors to allow machine-specific configuration Thomas Fitzsimmons
@ 2013-02-08 0:13 ` Thomas Fitzsimmons
2013-02-08 0:14 ` [meta-oe][PATCH 2/2] lmsensors: Add lmsensors-config RRECOMMENDS Thomas Fitzsimmons
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Fitzsimmons @ 2013-02-08 0:13 UTC (permalink / raw)
To: openembedded-devel
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
Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com>
---
.../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
diff --git a/meta-oe/recipes-support/lm_sensors/files/fancontrol b/meta-oe/recipes-support/lm_sensors/files/fancontrol
deleted file mode 100644
index 1f03a2b..0000000
--- a/meta-oe/recipes-support/lm_sensors/files/fancontrol
+++ /dev/null
@@ -1,2 +0,0 @@
-# fancontrol configuration file.
-# Place your device specific configuration in this file.
diff --git a/meta-oe/recipes-support/lm_sensors/files/sensord.cgi b/meta-oe/recipes-support/lm_sensors/files/sensord.cgi
deleted file mode 100644
index b1aad05..0000000
--- a/meta-oe/recipes-support/lm_sensors/files/sensord.cgi
+++ /dev/null
@@ -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>
diff --git a/meta-oe/recipes-support/lm_sensors/files/sensord.conf b/meta-oe/recipes-support/lm_sensors/files/sensord.conf
deleted file mode 100644
index 6b48cf6..0000000
--- a/meta-oe/recipes-support/lm_sensors/files/sensord.conf
+++ /dev/null
@@ -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"
diff --git a/meta-oe/recipes-support/lm_sensors/files/sensors.conf b/meta-oe/recipes-support/lm_sensors/files/sensors.conf
deleted file mode 100644
index bb8c93d..0000000
--- a/meta-oe/recipes-support/lm_sensors/files/sensors.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sensors configuration file.
-# Place your device specific configuration in this file.
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol b/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol
new file mode 100644
index 0000000..1f03a2b
--- /dev/null
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol
@@ -0,0 +1,2 @@
+# fancontrol configuration file.
+# Place your device specific configuration in this file.
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi
new file mode 100644
index 0000000..b1aad05
--- /dev/null
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi
@@ -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>
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf
new file mode 100644
index 0000000..6b48cf6
--- /dev/null
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf
@@ -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"
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf
new file mode 100644
index 0000000..bb8c93d
--- /dev/null
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf
@@ -0,0 +1,2 @@
+# sensors configuration file.
+# Place your device specific configuration in this file.
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
new file mode 100644
index 0000000..058ae1b
--- /dev/null
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
@@ -0,0 +1,50 @@
+SUMMARY = "lm_sensors configuration files"
+DESCRIPTION = "Hardware health monitoring configuration files"
+HOMEPAGE = "http://www.lm-sensors.org/"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRC_URI = "file://fancontrol \
+ file://sensord.cgi \
+ file://sensord.conf \
+ file://sensors.conf \
+"
+
+do_install() {
+ # Install fancontrol configuration file
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir}
+
+ # Install libsensors configuration file
+ install -d ${D}${sysconfdir}/sensors.d
+ install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d
+
+ # Install sensord configuration file
+ install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir}
+
+ # Install sensord.cgi script and create world-writable
+ # web-accessible sensord directory
+ install -d ${D}/www/pages/cgi-bin
+ install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin
+ install -d -m a=rwxs ${D}/www/pages/sensord
+}
+
+# libsensors configuration
+PACKAGES =+ "${PN}-libsensors"
+
+# sensord logging daemon configuration
+PACKAGES =+ "${PN}-sensord"
+
+# fancontrol script configuration
+PACKAGES =+ "${PN}-fancontrol"
+
+# libsensors configuration file
+FILES_${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf"
+
+# sensord logging daemon configuration files
+FILES_${PN}-sensord = "${sysconfdir}/sensord.conf /www/*"
+
+# fancontrol script configuration file
+FILES_${PN}-fancontrol = "${sysconfdir}/fancontrol"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-oe][PATCH 2/2] lmsensors: Add lmsensors-config RRECOMMENDS
2013-02-07 20:29 [meta-oe][PATCH 0/2] Refactor lmsensors to allow machine-specific configuration Thomas Fitzsimmons
2013-02-08 0:13 ` [meta-oe][PATCH 1/2] lmsensors-config: Initial commit Thomas Fitzsimmons
@ 2013-02-08 0:14 ` Thomas Fitzsimmons
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Fitzsimmons @ 2013-02-08 0:14 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Thomas Fitzsimmons <fitzsim@cisco.com>
---
.../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
diff --git a/meta-oe/recipes-support/lm_sensors/files/fancontrol.sh b/meta-oe/recipes-support/lm_sensors/files/fancontrol.sh
deleted file mode 100644
index f179310..0000000
--- a/meta-oe/recipes-support/lm_sensors/files/fancontrol.sh
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-support/lm_sensors/files/sensord.sh b/meta-oe/recipes-support/lm_sensors/files/sensord.sh
deleted file mode 100644
index 5a09cd3..0000000
--- a/meta-oe/recipes-support/lm_sensors/files/sensord.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /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
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
new file mode 100644
index 0000000..f179310
--- /dev/null
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
@@ -0,0 +1,48 @@
+#! /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
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init b/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init
new file mode 100644
index 0000000..5a09cd3
--- /dev/null
+++ b/meta-oe/recipes-support/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
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb
index 5c6c91d..1a1ef2d 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.2.bb
@@ -8,29 +8,28 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
DEPENDS = "sysfsutils virtual/libiconv bison-native flex-native rrdtool"
SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.bz2 \
- file://fancontrol \
- file://fancontrol.sh \
- file://sensors.conf \
- file://sensord.conf \
- file://sensord.sh \
- file://sensord.cgi \
+ file://fancontrol.init \
+ file://sensord.init \
"
SRC_URI[md5sum] = "f357ba00b080ab102a170f7bf8bb2578"
SRC_URI[sha256sum] = "f13dd885406841a7352ccfb8b9ccb23c4c057abe3de4258da5444c149a9e3ae1"
+PR = "r1"
+
inherit update-rc.d
INITSCRIPT_PACKAGES = "${PN}-fancontrol ${PN}-sensord"
-INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol.sh"
-INITSCRIPT_NAME_${PN}-sensord = "sensord.sh"
+INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol"
+INITSCRIPT_NAME_${PN}-sensord = "sensord"
INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66"
INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67"
S = "${WORKDIR}/lm_sensors-${PV}"
EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \
- MACHINE=${TARGET_ARCH} PREFIX=${prefix} CC="${CC}" AR="${AR}"'
+ MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \
+ CC="${CC}" AR="${AR}"'
do_compile() {
oe_runmake user PROG_EXTRA="sensors sensord"
@@ -39,37 +38,17 @@ do_compile() {
do_install() {
oe_runmake user_install DESTDIR=${D}
install -m 0755 ${S}/prog/sensord/sensord ${D}${bindir}
- install -m 0644 ${S}/prog/sensord/sensord.8 ${D}/usr/man/man8
-
- # move manuals into proper place
- install -d ${D}${mandir}
- rm -rf ${D}${mandir}/*
- mv ${D}/usr/man/* ${D}${mandir}
- rmdir ${D}/usr/man
+ install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8
- # Install directories
- install -d ${D}${sysconfdir}
+ # Install directory
install -d ${D}${sysconfdir}/init.d
- install -d ${D}${sysconfdir}/sensors.d
-
- # Install sensors.conf
- install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d
-
- # Install fancontrol config file
- install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir}
# Install fancontrol init script
- install -m 0755 ${WORKDIR}/fancontrol.sh ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/fancontrol.init \
+ ${D}${sysconfdir}/init.d/fancontrol
# Install sensord init script
- install -m 0755 ${WORKDIR}/sensord.sh ${D}${sysconfdir}/init.d
- install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir}
-
- # Install sensord.cgi script and create world-writable
- # web-accessible sensord directory.
- install -d ${D}/www/pages/cgi-bin
- install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin
- install -d -m a=rwxs ${D}/www/pages/sensord
+ install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord
}
# libsensors packages
@@ -97,11 +76,12 @@ PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc"
PACKAGES =+ "${PN}-isatools ${PN}-isatools-dbg ${PN}-isatools-doc"
# libsensors files
-FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d/sensors.conf"
+FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d"
FILES_${PN}-libsensors-dbg = "${libdir}/.debug ${prefix}/src/debug"
FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}"
FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a"
FILES_${PN}-libsensors-doc = "${mandir}/man3"
+RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors"
# sensors command files
FILES_${PN}-sensors = "${bindir}/sensors"
@@ -110,15 +90,17 @@ FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5"
RDEPENDS_${PN}-sensors = "${PN}-libsensors"
# sensord logging daemon
-FILES_${PN}-sensord = "${bindir}/sensord ${sysconfdir}/sensord.conf ${sysconfdir}/init.d/sensord.sh /www/*"
+FILES_${PN}-sensord = "${bindir}/sensord ${sysconfdir}/init.d/sensord"
FILES_${PN}-sensord-dbg = "${bindir}/.debug/sensord"
FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8"
RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool lighttpd lighttpd-module-cgi"
+RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord"
# fancontrol script files
-FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${sysconfdir}/fancontrol ${sysconfdir}/init.d/fancontrol.sh"
+FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${sysconfdir}/init.d/fancontrol"
FILES_${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8"
RDEPENDS_${PN}-fancontrol = "bash"
+RRECOMMENDS_${PN}-fancontrol = "lmsensors-config-fancontrol"
# sensors-detect script files
FILES_${PN}-sensorsdetect = "${sbindir}/sensors-detect"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-08 0:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-07 20:29 [meta-oe][PATCH 0/2] Refactor lmsensors to allow machine-specific configuration Thomas Fitzsimmons
2013-02-08 0:13 ` [meta-oe][PATCH 1/2] lmsensors-config: Initial commit Thomas Fitzsimmons
2013-02-08 0:14 ` [meta-oe][PATCH 2/2] lmsensors: Add lmsensors-config RRECOMMENDS Thomas Fitzsimmons
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.