diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-01-29 17:33:35 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 22:26:10 +0000 |
| commit | 521ec7e979409f213cd98ed6015fdba2fce89243 (patch) | |
| tree | db37289f8e7c296a806ef02dfa3d6435a09f96ed | |
| parent | a831cbe6cce67396148b41d56cbc12f99a972bd1 (diff) | |
| download | openembedded-core-contrib-521ec7e979409f213cd98ed6015fdba2fce89243.tar.gz | |
blktrace: fix and enable parallel build
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-kernel/blktrace/blktrace_git.bb | 5 |
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 00000000000..df087703485 --- /dev/null +++ b/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch @@ -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 + diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb index 7a329934b8c..29186fc10f6 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_git.bb @@ -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} \ |