[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7183/8267] sysstat: fix creating configuration file for /var/log/sa

[Emmanuele Bassi <ebassi src gnome org>]

commit e31ba8f1228d30d41a6b83aa3cc07051e9ff3872
Author: Chen Qi <Qi Chen windriver com>
Date:   Thu Aug 10 09:46:04 2017 +0800

    sysstat: fix creating configuration file for /var/log/sa
    
    Fix to create configuration file related to /var/log/sa for sysvinit
    and systemd systems respectively.
    
    (From OE-Core rev: 652e515cbdf0f6314b63ec52b9fcac42299c3d60)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/sysstat/sysstat.inc |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 18b0861..61da4cd 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -32,10 +32,16 @@ do_install() {
        autotools_do_install
 
        # don't install /var/log/sa when populating rootfs. Do it through volatile
-
        rm -rf ${D}/var
-       install -d ${D}/etc/default/volatiles
-       install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+               install -d ${D}/etc/default/volatiles
+               install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles
+       fi
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               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