aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-03-10 02:23:14 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:38:43 +0000
commit35bb619486d7f5721e8fa86c8744d4cea4d1746a (patch)
tree64043f720a575f9db85578be7632666e1556a474
parentd7092965166af8c37bfd643becc1473f75a0712d (diff)
downloadopenembedded-core-contrib-35bb619486d7f5721e8fa86c8744d4cea4d1746a.tar.gz
openembedded-core-contrib-35bb619486d7f5721e8fa86c8744d4cea4d1746a.tar.bz2
openembedded-core-contrib-35bb619486d7f5721e8fa86c8744d4cea4d1746a.zip
Revert "blktrace: fix and enable parallel build"
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> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch41
-rw-r--r--meta/recipes-kernel/blktrace/blktrace_git.bb17
2 files changed, 14 insertions, 44 deletions
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 df087703485..00000000000
--- 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 29186fc10f6..ef9f7376bc7 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