[PATCH 0/2] disable parallel build for mtd-utils and blktrace

[PATCH 0/2] disable parallel build for mtd-utils and blktrace

[Robert Yang]

The following changes since commit 0542472969d0eb28fd44da97e4e01d69d864d157:

  scripts/runqemu: clarify help text (2015-03-05 17:47:10 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/parallel
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/parallel

Robert Yang (2):
  mtd-utils: disable parallel build
  Revert "blktrace: fix and enable parallel build"

 meta/recipes-devtools/mtd/mtd-utils_git.bb         |    4 ++
 .../blktrace/blktrace/makefile-fix-parallel.patch  |   41 --------------------
 meta/recipes-kernel/blktrace/blktrace_git.bb       |   17 ++++++--
 3 files changed, 18 insertions(+), 44 deletions(-)
 delete mode 100644 meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch

-- 
1.7.9.5

[PATCH 1/2] mtd-utils: disable parallel build

[Robert Yang]

Disable parallel build because of:
git/.compr.c.dep:46: warning: NUL character seen; rest of line ignored
git/.compr.c.dep:47: *** missing separator.  Stop.

Because both mkfs.jffs2 and mkfs.ubifs depend on compr.c, and
.compr.c.dep may generate twice at the same time.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/mtd/mtd-utils_git.bb |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 267d1e9..f934b17 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -30,3 +30,7 @@ FILES_mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*"
 FILES_mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image"
 
 BBCLASSEXTEND = "native"
+
+# git/.compr.c.dep:46: warning: NUL character seen; rest of line ignored
+# git/.compr.c.dep:47: *** missing separator.  Stop.
+PARALLEL_MAKE = ""
-- 
1.7.9.5

[PATCH 2/2] Revert "blktrace: fix and enable parallel build"

[Robert Yang]

This reverts commit 2d9763a1c8685e9bd3a6b0aa0995eec5112dc4a7.

There are a few parallel issues:
1)
../rbtree.o: error adding symbols: Invalid operation
collect2: error: ld returned 1 exit status
Makefile:42: recipe for target 'btt' failed

2)
git/blkiomon.c:216: undefined reference to `rb_insert_color'
collect2: error: ld returned 1 exit status
Makefile:27: recipe for target 'blkparse' failed

3)
ld: rbtree.o: invalid string offset 128 >= 125 for section `.strtab'

4)
btreplay.o: file not recognized: File truncated
collect2: error: ld returned 1 exit status

btreplay/btreplay.c:47:18: fatal error: list.h: No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../blktrace/blktrace/makefile-fix-parallel.patch  |   41 --------------------
 meta/recipes-kernel/blktrace/blktrace_git.bb       |   17 ++++++--
 2 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch

diff --git a/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch b/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
deleted file mode 100644
index df08770..0000000
--- a/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 98cb9a95ce536d21be390934bd42dc2abde5959f Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Thu, 29 Jan 2015 22:18:06 -0800
-Subject: [PATCH] Makefile: fix for parallel build
-
-Fixed parallel issue:
-* btreplay.o: file not recognized: File truncated
-  collect2: error: ld returned 1 exit status
-
-* btreplay/btreplay.c:47:18: fatal error: list.h: No such file or directory
-  #include "list.h"
-                  ^
-  compilation terminated.
-
-  Don't make btreplay twice will fix the problem
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index fe35d02..e7b1e94 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,8 +17,8 @@ btt/btt:
- btreplay/btrecord:
- 	$(MAKE) -C btreplay
- 
--btreplay/btreplay:
--	$(MAKE) -C btreplay
-+btreplay/btreplay: btreplay/btrecord
-+	echo Building $@
- 
- %.o: %.c
- 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
--- 
-1.7.9.5
-
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 29186fc..ef9f737 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -10,9 +10,7 @@ PR = "r6"
 PV = "1.0.5+git${SRCPV}"
 
 SRC_URI = "git://git.kernel.dk/blktrace.git \
-           file://ldflags.patch \
-           file://makefile-fix-parallel.patch \
-           "
+           file://ldflags.patch"
 
 S = "${WORKDIR}/git"
 
@@ -22,6 +20,19 @@ EXTRA_OEMAKE = "\
     'LDFLAGS=${LDFLAGS}' \
 "
 
+# There are a few parallel issues:
+# 1) ../rbtree.o: error adding symbols: Invalid operation
+# collect2: error: ld returned 1 exit status
+# Makefile:42: recipe for target 'btt' failed
+# 2) git/blkiomon.c:216: undefined reference to `rb_insert_color'
+# collect2: error: ld returned 1 exit status
+# Makefile:27: recipe for target 'blkparse' failed
+# 3) ld: rbtree.o: invalid string offset 128 >= 125 for section `.strtab'
+# 4) btreplay.o: file not recognized: File truncated
+# collect2: error: ld returned 1 exit status
+# btreplay/btreplay.c:47:18: fatal error: list.h: No such file or directory
+PARALLEL_MAKE = ""
+
 do_install() {
 	oe_runmake ARCH="${ARCH}" prefix=${prefix} \
 		mandir=${mandir} DESTDIR=${D} install
-- 
1.7.9.5