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.

Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 4e29721666031be7a1c99569b819d980544abfcd..592cbf45743005c38f461817d3843955f685163f 100644 (file)
--- 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} () {