[oe-commits] [openembedded-core] 06/26: sysstat: use service file from source codes

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 6c653d49059ab2d0bbaadb9f58475aba9cff621c
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Tue Jul 9 13:53:28 2019 +0800

    sysstat: use service file from source codes
    
    Use service file from sysstat source codes.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/sysstat/sysstat.inc             |  8 ++------
 meta/recipes-extended/sysstat/sysstat/sysstat.service | 12 ------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 4e29721..9085fcf 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -6,7 +6,6 @@ SECTION = "console/utils"
 
 SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \
            file://99_sysstat \
-           file://sysstat.service \
           "
 
 UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html"
@@ -17,9 +16,10 @@ 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}"
 
 EXTRA_OECONF += "--disable-stripping"
 
@@ -45,10 +45,6 @@ do_install() {
 	        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
 }
 
 pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/sysstat/sysstat/sysstat.service b/meta/recipes-extended/sysstat/sysstat/sysstat.service
deleted file mode 100644
index aff0710..0000000
--- a/meta/recipes-extended/sysstat/sysstat/sysstat.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Resets System Activity Logs
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-User=root
-ExecStart=@LIBDIR@/sa/sa1 --boot
-
-[Install]
-WantedBy=multi-user.target
-

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.