blktrace: fix and enable parallel build

(From OE-Core rev: 521ec7e979409f213cd98ed6015fdba2fce89243)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2015-01-29 17:33:35 -08:00 committed by Richard Purdie
parent 7502fa5feb
commit 2d9763a1c8
2 changed files with 44 additions and 2 deletions

View File

@ -0,0 +1,41 @@
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

View File

@ -10,7 +10,9 @@ PR = "r6"
PV = "1.0.5+git${SRCPV}"
SRC_URI = "git://git.kernel.dk/blktrace.git \
file://ldflags.patch"
file://ldflags.patch \
file://makefile-fix-parallel.patch \
"
S = "${WORKDIR}/git"
@ -19,7 +21,6 @@ EXTRA_OEMAKE = "\
'CFLAGS=${CFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
"
PARALLEL_MAKE = ""
do_install() {
oe_runmake ARCH="${ARCH}" prefix=${prefix} \