[OE-core] [PATCH 3/3] sysstat: 12.1.3 -> 12.1.6

[Kang Kai]

On 2019/9/4 下午5:01, kai.kang at windriver.com wrote:
> From: Kai Kang <kai.kang at windriver.com>
>
> Update sysstat from 12.1.3 to 12.1.6.
>
> * remove sysstat.service and use the one from sysstat itself

After Qi's reminder, I checked the history that sysstat.service should 
not be removed.

v2 will be sent.

Regards,
Kai


> * make sa_lib_dir refer to ${libexecdir}/sa to fix conflictions when
>    multilib is enabled
>
> Signed-off-by: Kai Kang <kai.kang at windriver.com>
> ---
>   meta/recipes-extended/sysstat/sysstat.inc            |  5 ++---
>   .../recipes-extended/sysstat/sysstat/sysstat.service | 12 ------------
>   .../sysstat/{sysstat_12.1.3.bb => sysstat_12.1.6.bb} |  4 ++--
>   3 files changed, 4 insertions(+), 17 deletions(-)
>   delete mode 100644 meta/recipes-extended/sysstat/sysstat/sysstat.service
>   rename meta/recipes-extended/sysstat/{sysstat_12.1.3.bb => sysstat_12.1.6.bb} (53%)
>
> diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
> index 592cbf4574..c3cc2c3374 100644
> --- a/meta/recipes-extended/sysstat/sysstat.inc
> +++ b/meta/recipes-extended/sysstat/sysstat.inc
> @@ -4,9 +4,8 @@ HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
>   LICENSE = "GPLv2+"
>   SECTION = "console/utils"
>   
> -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \
> +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \
>              file://99_sysstat \
> -           file://sysstat.service \
>             "
>   
>   UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html"
> @@ -29,7 +28,7 @@ SYSTEMD_SERVICE_${PN} = "sysstat.service"
>   SYSTEMD_AUTO_ENABLE = "enable"
>   
>   do_configure_prepend() {
> -    export sa_lib_dir=${libdir}/sa
> +    export sa_lib_dir=${libexecdir}/sa
>   }
>   
>   do_install() {
> 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 @@
> -[Unit]
> -Description=Resets System Activity Logs
> -
> -[Service]
> -Type=oneshot
> -RemainAfterExit=yes
> -User=root
> -ExecStart=@LIBDIR@/sa/sa1 --boot
> -
> -[Install]
> -WantedBy=multi-user.target
> -
> diff --git a/meta/recipes-extended/sysstat/sysstat_12.1.3.bb b/meta/recipes-extended/sysstat/sysstat_12.1.6.bb
> similarity index 53%
> rename from meta/recipes-extended/sysstat/sysstat_12.1.3.bb
> rename to meta/recipes-extended/sysstat/sysstat_12.1.6.bb
> index 5daf3f45f5..8cf8c36d9b 100644
> --- a/meta/recipes-extended/sysstat/sysstat_12.1.3.bb
> +++ b/meta/recipes-extended/sysstat/sysstat_12.1.6.bb
> @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
>   
>   SRC_URI += "file://0001-Include-needed-headers-explicitly.patch"
>   
> -SRC_URI[md5sum] = "0f9b73f60aba6fd49de346bc384902c3"
> -SRC_URI[sha256sum] = "55498bf82755ba9fed3e7df61fd26f8f50dd3e7b3b229c731029a4c8ab51a1aa"
> +SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570"
> +SRC_URI[sha256sum] = "f752f3c406153a6fc446496f1102872505ace3f0931d975c1d664c81ec09f129"


-- 
Kai Kang