diff options
| author |   Li Xin <lixin.fnst@cn.fujitsu.com> | 2015-10-20 09:32:29 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 12:53:25 +0200 |
| commit | 9dc7608a0cce8c845d2747fc0e55cc14e369d665 (patch) | |
| tree | 5afb8f9026a0d305081a9f5ed07d864025ab57c0 | |
| parent | 5cae400897832f5c69eb4d6c0c493205c1fd5284 (diff) | |
| download | meta-openembedded-contrib-9dc7608a0cce8c845d2747fc0e55cc14e369d665.tar.gz | |
lmsensors: remove unused service file
* 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>
| -rw-r--r-- | meta-oe/recipes-support/lm_sensors/lmsensors/sensord.service | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb | 9 |
2 files changed, 2 insertions, 18 deletions
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.service b/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.service deleted file mode 100644 index 4836d8ff05..0000000000 --- a/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.service +++ /dev/null @@ -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 diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb index 66e89235cb..a483fb38a8 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb +++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb @@ -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 \ file://fancontrol.init \ file://sensord.init \ - file://sensord.service \ " SRC_URI[md5sum] = "c03675ae9d43d60322110c679416901a" SRC_URI[sha256sum] = "e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f" @@ -26,7 +25,7 @@ INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" 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" S = "${WORKDIR}/lm_sensors-${PV}" @@ -58,11 +57,7 @@ do_install() { # Insall sensord service script if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sensord.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 + install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system fi } |