summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-29 17:33:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:27 +0000
commit2d9763a1c8685e9bd3a6b0aa0995eec5112dc4a7 (patch)
tree4a2775f7b85f23f7ff97366a2b2fbb6eca703cdf
parent7502fa5febdd7a2281d626f7040782fb1f9af59e (diff)
downloadpoky-2d9763a1c8685e9bd3a6b0aa0995eec5112dc4a7.tar.gz
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>
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch41
-rw-r--r--meta/recipes-kernel/blktrace/blktrace_git.bb5
2 files changed, 44 insertions, 2 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch b/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
new file mode 100644
index 0000000000..df08770348
--- /dev/null
+++ b/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
@@ -0,0 +1,41 @@
1From 98cb9a95ce536d21be390934bd42dc2abde5959f Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 29 Jan 2015 22:18:06 -0800
4Subject: [PATCH] Makefile: fix for parallel build
5
6Fixed parallel issue:
7* btreplay.o: file not recognized: File truncated
8 collect2: error: ld returned 1 exit status
9
10* btreplay/btreplay.c:47:18: fatal error: list.h: No such file or directory
11 #include "list.h"
12 ^
13 compilation terminated.
14
15 Don't make btreplay twice will fix the problem
16
17Upstream-Status: Pending
18
19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20---
21 Makefile | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/Makefile b/Makefile
25index fe35d02..e7b1e94 100644
26--- a/Makefile
27+++ b/Makefile
28@@ -17,8 +17,8 @@ btt/btt:
29 btreplay/btrecord:
30 $(MAKE) -C btreplay
31
32-btreplay/btreplay:
33- $(MAKE) -C btreplay
34+btreplay/btreplay: btreplay/btrecord
35+ echo Building $@
36
37 %.o: %.c
38 $(CC) -o $*.o -c $(ALL_CFLAGS) $<
39--
401.7.9.5
41
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 7a329934b8..29186fc10f 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -10,7 +10,9 @@ PR = "r6"
10PV = "1.0.5+git${SRCPV}" 10PV = "1.0.5+git${SRCPV}"
11 11
12SRC_URI = "git://git.kernel.dk/blktrace.git \ 12SRC_URI = "git://git.kernel.dk/blktrace.git \
13 file://ldflags.patch" 13 file://ldflags.patch \
14 file://makefile-fix-parallel.patch \
15 "
14 16
15S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
16 18
@@ -19,7 +21,6 @@ EXTRA_OEMAKE = "\
19 'CFLAGS=${CFLAGS}' \ 21 'CFLAGS=${CFLAGS}' \
20 'LDFLAGS=${LDFLAGS}' \ 22 'LDFLAGS=${LDFLAGS}' \
21" 23"
22PARALLEL_MAKE = ""
23 24
24do_install() { 25do_install() {
25 oe_runmake ARCH="${ARCH}" prefix=${prefix} \ 26 oe_runmake ARCH="${ARCH}" prefix=${prefix} \