mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 16:27:27 +00:00
Code Issues Projects Releases Wiki Activity

lmsensors: remove unused service file

Browse Source 
* Upstream ships a systemd service file sensord.service now,
  so we don't need this anymore.
* Install lm_sensors.service and fancontrol.service to support systemd systems.
  lm_sensors.service: Initialize hardware monitoring sensors.
  fancontrol.service: Start fan control, if configured.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Li Xin
2015-10-20 09:32:29 +08:00
committed by Martin Jansa
parent 5cae400897
commit 9dc7608a0c
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/lm_sensors/lmsensors/sensord.service
-11
View File
@@ -1,11 +0,0 @@
[Unit]
Description=Sensor Information Logging
[Service]
Type=forking
EnvironmentFile=-@SYSCONFDIR@/sensord.conf
PIDFile=@LOCALSTATEDIR@/run/sensord.pid
ExecStart=@SBINDIR@/sensord $SENSORD_ARGS
[Install]
WantedBy=multi-user.target
meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb
+2 -7
View File
@@ -10,7 +10,6 @@ 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://sensord.service \
" "
SRC_URI[md5sum] = "c03675ae9d43d60322110c679416901a" SRC_URI[md5sum] = "c03675ae9d43d60322110c679416901a"
SRC_URI[sha256sum] = "e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f" SRC_URI[sha256sum] = "e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f"
@@ -26,7 +25,7 @@ INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66"
INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67"
SYSTEMD_PACKAGES = "${PN}-sensord" SYSTEMD_PACKAGES = "${PN}-sensord"
SYSTEMD_SERVICE_${PN}-sensord = "sensord.service" SYSTEMD_SERVICE_${PN}-sensord = "sensord.service lm_sensors.service fancontrol.service"
SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_AUTO_ENABLE = "disable"
S = "${WORKDIR}/lm_sensors-${PV}" S = "${WORKDIR}/lm_sensors-${PV}"
@@ -58,11 +57,7 @@ do_install() {
# Insall sensord service script # Insall sensord service script
if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/sensord.service ${D}${systemd_unitdir}/system install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system
sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/sensord.service
sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/sensord.service
sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/sensord.service
fi fi
} }