summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-09-14 08:31:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-18 15:49:56 +0100
commit99cfbe96b4c0a9c76fdc8e3b16c845257f66148f (patch)
tree0579a5449517fe8bc5c6253e95b00cd3f3b9a2fb /meta
parent803870d45aa8c1bb17918a4890cd5d8c78108f8b (diff)
downloadpoky-99cfbe96b4c0a9c76fdc8e3b16c845257f66148f.tar.gz
sysstat: upgrade to 10.1.7
Remove patch that was backported and from verion we updated to Also cleanup white space (From OE-Core rev: 849fbd50a52f1aa0330b47993d38a0f7812977c7) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch34
-rw-r--r--meta/recipes-extended/sysstat/sysstat.inc4
-rw-r--r--meta/recipes-extended/sysstat/sysstat_10.1.6.bb6
-rw-r--r--meta/recipes-extended/sysstat/sysstat_10.1.7.bb6
4 files changed, 8 insertions, 42 deletions
diff --git a/meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch b/meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch
deleted file mode 100644
index c82b19cf10..0000000000
--- a/meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Roy.Li <rongqing.li@windriver.com>
3
4From eb44730094a68f4d37d95ddc3480a5972619b43f Mon Sep 17 00:00:00 2001
5From: Sebastien GODARD <sysstat@orange.fr.fake>
6Date: Sat, 22 Jun 2013 14:08:40 +0200
7Subject: [PATCH] Update Makefile to allow for parallel execution
8
9Rewrite rule for librdstats.a in Makefile to prevent possible file
10corruption when using make -j.
11
12Signed-off-by: Sebastien GODARD <sysstat@orange.fr.fake>
13---
14 Makefile.in | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17diff --git a/Makefile.in b/Makefile.in
18index f8e6159..159cacf 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -202,7 +202,9 @@ sadf_misc.o: sadf_misc.c sadf.h sa.h
22 libsyscom.a: common.o ioconf.o
23 $(AR) rvs $@ $?
24
25-librdstats.a: librdstats.a(rd_stats.o count.o)
26+# Ditto
27+librdstats.a: rd_stats.o count.o
28+ $(AR) rvs $@ $?
29
30 librdsensors.a: librdsensors.a(rd_sensors.o)
31
32--
331.7.10.4
34
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index ac3c89be3c..af1fa0c7cf 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -5,8 +5,8 @@ LICENSE = "GPLv2+"
5SECTION = "console/utils" 5SECTION = "console/utils"
6 6
7SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ 7SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
8 file://99_sysstat \ 8 file://99_sysstat \
9 file://0001-Update-Makefile-to-allow-for-parallel-execution.patch " 9 "
10 10
11inherit autotools gettext 11inherit autotools gettext
12 12
diff --git a/meta/recipes-extended/sysstat/sysstat_10.1.6.bb b/meta/recipes-extended/sysstat/sysstat_10.1.6.bb
deleted file mode 100644
index 2a003c888f..0000000000
--- a/meta/recipes-extended/sysstat/sysstat_10.1.6.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require sysstat.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
4
5SRC_URI[md5sum] = "909135c84e36d780d501274e7450f924"
6SRC_URI[sha256sum] = "236c6ac3136706019170ea55426f9ae016092214a5f27d9b2f373418e433d9df"
diff --git a/meta/recipes-extended/sysstat/sysstat_10.1.7.bb b/meta/recipes-extended/sysstat/sysstat_10.1.7.bb
new file mode 100644
index 0000000000..50c1301519
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat_10.1.7.bb
@@ -0,0 +1,6 @@
1require sysstat.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
4
5SRC_URI[md5sum] = "112c8cc92114c961709d09f6afa537bd"
6SRC_URI[sha256sum] = "1772c9c7431376458f3e7ba252c2dda88bbdc4b1cfc6f94f3d810e23e5fdac77"