]> code.ossystems Code Review - openembedded-core.git/commitdiff
sysstat: fix creating configuration file for /var/log/sa
authorChen Qi <Qi.Chen@windriver.com>
Thu, 10 Aug 2017 01:46:04 +0000 (09:46 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 15 Aug 2017 23:01:42 +0000 (00:01 +0100)
Fix to create configuration file related to /var/log/sa for sysvinit
and systemd systems respectively.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/sysstat/sysstat.inc

index 18b0861bf999ca60d9f0f264ee35952a36b158fe..61da4cde0feb18ee03f425b686aa3f604806064a 100644 (file)
@@ -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