summaryrefslogtreecommitdiffstats
path: root/meta
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:42:03 +0000
commite67611baa582aa5aef342bc678b4e43c13ff3323 (patch)
tree4b395e45d66b1d27f53abc7409534a29107f49ad /meta
parent9afc9eaa3a6d11ce73b00f5360d5fbd767e0ac00 (diff)
downloadpoky-e67611baa582aa5aef342bc678b4e43c13ff3323.tar.gz
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 (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>
Diffstat (limited to 'meta')
-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 df08770348..0000000000
--- a/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
+++ /dev/null
@@ -1,41 +0,0 @@
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 29186fc10f..ef9f7376bc 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -10,9 +10,7 @@ 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 "
16 14
17S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
18 16
@@ -22,6 +20,19 @@ EXTRA_OEMAKE = "\
22 'LDFLAGS=${LDFLAGS}' \ 20 'LDFLAGS=${LDFLAGS}' \
23" 21"
24 22
23# There are a few parallel issues:
24# 1) ../rbtree.o: error adding symbols: Invalid operation
25# collect2: error: ld returned 1 exit status
26# Makefile:42: recipe for target 'btt' failed
27# 2) git/blkiomon.c:216: undefined reference to `rb_insert_color'
28# collect2: error: ld returned 1 exit status
29# Makefile:27: recipe for target 'blkparse' failed
30# 3) ld: rbtree.o: invalid string offset 128 >= 125 for section `.strtab'
31# 4) btreplay.o: file not recognized: File truncated
32# collect2: error: ld returned 1 exit status
33# btreplay/btreplay.c:47:18: fatal error: list.h: No such file or directory
34PARALLEL_MAKE = ""
35
25do_install() { 36do_install() {
26 oe_runmake ARCH="${ARCH}" prefix=${prefix} \ 37 oe_runmake ARCH="${ARCH}" prefix=${prefix} \
27 mandir=${mandir} DESTDIR=${D} install 38 mandir=${mandir} DESTDIR=${D} install