[oe-commits] Thomas Fitzsimmons : lmsensors: Add lmsensors-config RRECOMMENDS
git at git.openembedded.org
git at git.openembedded.org
Sat Feb 16 04:57:12 UTC 2013
Module: meta-openembedded.git
Branch: master
Commit: b51fc0f069f3444d485d75bfdd373b7d559d6b61
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b51fc0f069f3444d485d75bfdd373b7d559d6b61
Author: Thomas Fitzsimmons <fitzsim at cisco.com>
Date: Fri Feb 8 00:14:56 2013 +0000
lmsensors: Add lmsensors-config RRECOMMENDS
Signed-off-by: Thomas Fitzsimmons <fitzsim at cisco.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../fancontrol.sh => lmsensors/fancontrol.init} | 0
.../{files/sensord.sh => lmsensors/sensord.init} | 0
.../recipes-support/lm_sensors/lmsensors_3.3.2.bb | 56 +++++++-------------
3 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/meta-oe/recipes-support/lm_sensors/files/fancontrol.sh b/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
similarity index 100%
rename from meta-oe/recipes-support/lm_sensors/files/fancontrol.sh
rename to meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init
diff --git a/meta-oe/recipes-support/lm_sensors/files/sensord.sh b/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init
similarity index 100%
rename from meta-oe/recipes-support/lm_sensors/files/sensord.sh
rename to meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init
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"
More information about the Openembedded-commits
mailing list