summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-07-09 13:53:28 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-10 09:56:22 +0100
commit721f09d4897425c7131470bd756eee1b90937feb (patch)
tree1088e20b16157799b9ed3ddb6e222c7637452e54 /meta/recipes-extended
parent628c03af41c7d24d6149da522ceb52ff70513884 (diff)
downloadpoky-721f09d4897425c7131470bd756eee1b90937feb.tar.gz
sysstat: use service file from source codes
Use service file from sysstat source codes. (From OE-Core rev: 2266c8f627af71b89628c25dc412977054ebcd4a) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/sysstat/sysstat.inc8
-rw-r--r--meta/recipes-extended/sysstat/sysstat/sysstat.service12
2 files changed, 2 insertions, 18 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 4e29721666..9085fcfe74 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -6,7 +6,6 @@ SECTION = "console/utils"
6 6
7SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \ 7SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \
8 file://99_sysstat \ 8 file://99_sysstat \
9 file://sysstat.service \
10 " 9 "
11 10
12UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html" 11UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html"
@@ -17,9 +16,10 @@ DEPENDS += "base-passwd"
17# autotools-brokensep as this package doesn't use automake 16# autotools-brokensep as this package doesn't use automake
18inherit autotools-brokensep gettext systemd upstream-version-is-even 17inherit autotools-brokensep gettext systemd upstream-version-is-even
19 18
20PACKAGECONFIG ??= "" 19PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
21PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" 20PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors"
22PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only" 21PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only"
22PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}"
23 23
24EXTRA_OECONF += "--disable-stripping" 24EXTRA_OECONF += "--disable-stripping"
25 25
@@ -45,10 +45,6 @@ do_install() {
45 echo "d ${localstatedir}/log/sa - - - -" \ 45 echo "d ${localstatedir}/log/sa - - - -" \
46 > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf 46 > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf
47 fi 47 fi
48
49 install -d ${D}${systemd_unitdir}/system
50 install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system
51 sed -i -e 's#@LIBDIR@#${libdir}#g' ${D}${systemd_unitdir}/system/sysstat.service
52} 48}
53 49
54pkg_postinst_${PN} () { 50pkg_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 aff07109f5..0000000000
--- a/meta/recipes-extended/sysstat/sysstat/sysstat.service
+++ /dev/null
@@ -1,12 +0,0 @@
1[Unit]
2Description=Resets System Activity Logs
3
4[Service]
5Type=oneshot
6RemainAfterExit=yes
7User=root
8ExecStart=@LIBDIR@/sa/sa1 --boot
9
10[Install]
11WantedBy=multi-user.target
12