From adb34c109832b2626af7fef4793c92abfc5b9dfe Mon Sep 17 00:00:00 2001 From: Haiqing Bai Date: Fri, 12 Jul 2019 13:49:26 +0100 Subject: sysstat: Use sysstat.service in source for cron with systemd The sysstat.service script in source launchs sysstat-collect and sysstat-summary services when cron is installed with systemd. At this time, the upstream sysstat.service must be installed. (From OE-Core rev: 06a596ff8100f4a6506ff8d7f9ec93dd6aac6cb2) Signed-off-by: Haiqing Bai Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/sysstat/sysstat.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'meta/recipes-extended/sysstat') diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 4e29721666..592cbf4574 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -20,6 +20,7 @@ inherit autotools-brokensep gettext systemd upstream-version-is-even PACKAGECONFIG ??= "" PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}" EXTRA_OECONF += "--disable-stripping" @@ -44,11 +45,13 @@ do_install() { install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/sa - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf - fi - 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 + 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 + fi + fi } pkg_postinst_${PN} () { -- cgit v1.2.3-54-g00ecf