diff options
| -rw-r--r-- | meta/recipes-extended/sysstat/sysstat.inc | 8 | ||||
| -rw-r--r-- | 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 4e297216660..9085fcfe744 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 aff07109f54..00000000000 --- 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 - |