sysstat: Correct when to use the package provided systemd unit files

There have been a number of changes back and forth as to when and how
to use the systemd unit files provided by the package. The correct
condition is actually that both cron and systemd need to be enabled
for them to be installed.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.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 9394090136343b17edf70e1573e1e95731e4655d..62de36b44bf9c11050908ffc5e14ff8cdbc3d9b0 100644 (file)
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -17,7 +17,7 @@ DEPENDS += "base-passwd"
 # autotools-brokensep as this package doesn't use automake
 inherit autotools-brokensep gettext systemd upstream-version-is-even
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 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}"
@@ -46,7 +46,9 @@ do_install() {
                echo "d ${localstatedir}/log/sa - - - -" \
                     > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf
 
-               if ${@bb.utils.contains('PACKAGECONFIG', 'cron', 'false', 'true', d)}; then
+               # Unless both cron and systemd are enabled, install our own
+               # systemd unit file. Otherwise the package will install one.
+               if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then
                        install -d ${D}${systemd_unitdir}/system
                        install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system
                        sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/sysstat.service