summaryrefslogtreecommitdiff
path: root/meta/recipes-extended/sysstat
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:46:14 +0100
commit849fbd50a52f1aa0330b47993d38a0f7812977c7 (patch)
tree4b9e8552daab9c06040ad5146c23c0223ba8d5c1 /meta/recipes-extended/sysstat
parent0ce598e60015ad75a97fd0250266d0dd591100b4 (diff)
downloadopenembedded-core-849fbd50a52f1aa0330b47993d38a0f7812977c7.tar.gz
openembedded-core-849fbd50a52f1aa0330b47993d38a0f7812977c7.tar.bz2
openembedded-core-849fbd50a52f1aa0330b47993d38a0f7812977c7.zip
sysstat: upgrade to 10.1.7
Remove patch that was backported and from verion we updated to Also cleanup white space Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/sysstat')
-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 @@
-Upstream-Status: Backport
-Signed-off-by: Roy.Li <rongqing.li@windriver.com>
-
-From eb44730094a68f4d37d95ddc3480a5972619b43f Mon Sep 17 00:00:00 2001
-From: Sebastien GODARD <sysstat@orange.fr.fake>
-Date: Sat, 22 Jun 2013 14:08:40 +0200
-Subject: [PATCH] Update Makefile to allow for parallel execution
-
-Rewrite rule for librdstats.a in Makefile to prevent possible file
-corruption when using make -j.
-
-Signed-off-by: Sebastien GODARD <sysstat@orange.fr.fake>
----
- Makefile.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f8e6159..159cacf 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -202,7 +202,9 @@ sadf_misc.o: sadf_misc.c sadf.h sa.h
- libsyscom.a: common.o ioconf.o
- $(AR) rvs $@ $?
-
--librdstats.a: librdstats.a(rd_stats.o count.o)
-+# Ditto
-+librdstats.a: rd_stats.o count.o
-+ $(AR) rvs $@ $?
-
- librdsensors.a: librdsensors.a(rd_sensors.o)
-
---
-1.7.10.4
-
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+"
SECTION = "console/utils"
SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
- file://99_sysstat \
- file://0001-Update-Makefile-to-allow-for-parallel-execution.patch "
+ file://99_sysstat \
+ "
inherit autotools gettext
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 @@
-require sysstat.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-
-SRC_URI[md5sum] = "909135c84e36d780d501274e7450f924"
-SRC_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 @@
+require sysstat.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+SRC_URI[md5sum] = "112c8cc92114c961709d09f6afa537bd"
+SRC_URI[sha256sum] = "1772c9c7431376458f3e7ba252c2dda88bbdc4b1cfc6f94f3d810e23e5fdac77"