diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-09-14 08:31:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-18 15:49:56 +0100 |
| commit | 99cfbe96b4c0a9c76fdc8e3b16c845257f66148f (patch) | |
| tree | 0579a5449517fe8bc5c6253e95b00cd3f3b9a2fb /meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch | |
| parent | 803870d45aa8c1bb17918a4890cd5d8c78108f8b (diff) | |
| download | poky-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/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch')
| -rw-r--r-- | meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch | 34 |
1 files changed, 0 insertions, 34 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 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
| 3 | |||
| 4 | From eb44730094a68f4d37d95ddc3480a5972619b43f Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Sebastien GODARD <sysstat@orange.fr.fake> | ||
| 6 | Date: Sat, 22 Jun 2013 14:08:40 +0200 | ||
| 7 | Subject: [PATCH] Update Makefile to allow for parallel execution | ||
| 8 | |||
| 9 | Rewrite rule for librdstats.a in Makefile to prevent possible file | ||
| 10 | corruption when using make -j. | ||
| 11 | |||
| 12 | Signed-off-by: Sebastien GODARD <sysstat@orange.fr.fake> | ||
| 13 | --- | ||
| 14 | Makefile.in | 4 +++- | ||
| 15 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/Makefile.in b/Makefile.in | ||
| 18 | index 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 | -- | ||
| 33 | 1.7.10.4 | ||
| 34 | |||
