sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Revert "blktrace: fix and enable parallel build" 

This reverts commit 2d9763a1c8.

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

(From OE-Core rev: 35bb619486d7f5721e8fa86c8744d4cea4d1746a)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2015-03-10 02:23:14 -07:00 committed by Richard Purdie
parent 9afc9eaa3a
commit e67611baa5
2 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
View File

@ -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

17
meta/recipes-kernel/blktrace/blktrace_git.bb
View File

@ -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