Skip to contentSkip to conversation

sysstat: backport a patch to fix a parallel building error

PATCH New [email protected] 1 participant 2 messages Jul 2, 2013

lore
Share & tools
lore
#0 lore raw

v2 cover sysstat: backport a patch to fix a parallel building error

From: "Roy.Li" <[email protected]>

The following changes since commit ff65497cd9a96d5ab49b16ba1f7e30a216ff4a42:

classes/insane: remove la2 check which no longer exists from ERROR_QA (2013-06-28 16:33:05 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib roy/sysstat-1
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/sysstat-1

Roy.Li (1):
sysstat: backport a patch to fix a parallel building error

 ...-Makefile-to-allow-for-parallel-execution.patch |   34 ++++++++++++++++++++
 meta/recipes-extended/sysstat/sysstat.inc          |    3 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 1/1 sysstat: backport a patch to fix a parallel building error

From: "Roy.Li" <[email protected]>

---
 ...-Makefile-to-allow-for-parallel-execution.patch |   34 ++++++++++++++++++++
 meta/recipes-extended/sysstat/sysstat.inc          |    3 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch
meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch new file +34 -0
new file mode 100644
index 0000000..c82b19c
@@ -0,0 +1,34 @@
+Upstream-Status: Backport
+Signed-off-by: Roy.Li <[email protected]>
+
+From eb44730094a68f4d37d95ddc3480a5972619b43f Mon Sep 17 00:00:00 2001
+From: Sebastien GODARD <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-extended/sysstat/sysstat.inc +2 -1
index 263cbd2..ac3c89b 100644
@@ -5,7 +5,8 @@ LICENSE = "GPLv2+"
 SECTION = "console/utils"
 
 SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
-		   file://99_sysstat"
+		   file://99_sysstat \
+		   file://0001-Update-Makefile-to-allow-for-parallel-execution.patch "
 
 inherit autotools gettext
 
Signature · 1 line
1.7.10.4