diff options
Diffstat (limited to 'meta/recipes-extended/sysstat/sysstat.inc')
-rw-r--r-- | meta/recipes-extended/sysstat/sysstat.inc | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 5a7d2114ca..8345c1e3d1 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -10,14 +10,13 @@ SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \ " UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" -UPSTREAM_VERSION_UNKNOWN = "1" 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}" @@ -25,16 +24,19 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}" EXTRA_OECONF += "--disable-stripping" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "sysstat.service" +SYSTEMD_SERVICE:${PN} = "sysstat.service" SYSTEMD_AUTO_ENABLE = "enable" -do_configure_prepend() { +do_configure:prepend() { export sa_lib_dir=${libexecdir}/sa } do_install() { autotools_do_install + # Don't version the documentation + mv ${D}${docdir}/${BP} ${D}${docdir}/${BPN} + # don't install /var/log/sa when populating rootfs. Do it through volatile rm -rf ${D}/var if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then @@ -46,15 +48,17 @@ do_install() { echo "d ${localstatedir}/log/sa - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf - if ${@bb.utils.contains('PACKAGECONFIG', 'cron', 'false', 'true', d)}; then - 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 + # 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_system_unitdir} + install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service fi fi } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ ! -n "$D" ]; then if [ -e /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update @@ -62,6 +66,6 @@ pkg_postinst_${PN} () { fi } -FILES_${PN} += "${libdir}/sa ${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd" TARGET_CC_ARCH += "${LDFLAGS}" |