diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-11-13 06:14:03 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-14 12:55:57 +0000 |
| commit | 0fd691b9801b5313ff2e2c2cd5ca13fd50063235 (patch) | |
| tree | 60b95cc4eec3732670dc5305d9db662ea297eda6 | |
| parent | 4a82f8f8105b40208159230ed0102d2f1b991bc1 (diff) | |
| download | openembedded-core-contrib-0fd691b9801b5313ff2e2c2cd5ca13fd50063235.tar.gz | |
sysstat: Correct our systemd unit file
In commit 8862f21e (sysstat: 12.1.3 -> 12.1.6), sa_lib_dir was changed
from "${libdir}/sa" to "${libexecdir}/sa" to avoid problems with
multilib. However, the systemd unit file was not changed accordingly,
which lead to the following error when trying to start the service:
systemd[4698]: sysstat.service: Failed at step EXEC spawning
/usr/lib/sa/sa1: No such file or directory
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/sysstat/sysstat.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/sysstat/sysstat/sysstat.service | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 5a7d2114ca..9394090136 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -49,7 +49,7 @@ do_install() { if ${@bb.utils.contains('PACKAGECONFIG', 'cron', 'false', 'true', d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system - sed -i -e 's#@LIBDIR@#${libdir}#g' ${D}${systemd_unitdir}/system/sysstat.service + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/sysstat.service fi fi } @@ -62,6 +62,6 @@ pkg_postinst_${PN} () { fi } -FILES_${PN} += "${libdir}/sa ${systemd_system_unitdir}" +FILES_${PN} += "${systemd_system_unitdir}" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta/recipes-extended/sysstat/sysstat/sysstat.service b/meta/recipes-extended/sysstat/sysstat/sysstat.service index aff07109f5..ca46befb99 100644 --- a/meta/recipes-extended/sysstat/sysstat/sysstat.service +++ b/meta/recipes-extended/sysstat/sysstat/sysstat.service @@ -5,7 +5,7 @@ Description=Resets System Activity Logs Type=oneshot RemainAfterExit=yes User=root -ExecStart=@LIBDIR@/sa/sa1 --boot +ExecStart=@LIBEXECDIR@/sa/sa1 --boot [Install] WantedBy=multi-user.target |