summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2010-12-29 11:25:42 -0600
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 09:37:39 +0000
commit3156e757f23c66b0afb679119dc1d1288492325a (patch)
tree8d9d90be8384501610bff7e2fa76a481a2995931 /meta
parent6ee0c26e21f48dcd47af88ed5c174e76e76a3e42 (diff)
downloadpoky-3156e757f23c66b0afb679119dc1d1288492325a.tar.gz
blktrace: Fix parallel make issue
Fixes [BUGID #581] When PARALLEL_MAKE is used with the current blktrace Makefile, the btreplay and btrecord object files can end up being built multiple times in parallel, which occasionally causes the linker to pick up the object files in intermediate and seemingly corrupt states, and causes the spurious link errors in the bug report. This fix restricts the recursive btreplay invocations to building only btreplay or btrecord as appropriate, not both. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch4
-rw-r--r--meta/recipes-kernel/blktrace/blktrace_git.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch b/meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch
index 87ee24ea35..c6a06ed349 100644
--- a/meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch
+++ b/meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch
@@ -17,11 +17,11 @@ Index: git/Makefile
17 17
18 btreplay/btrecord: 18 btreplay/btrecord:
19- $(MAKE) -C btreplay 19- $(MAKE) -C btreplay
20+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" 20+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btrecord
21 21
22 btreplay/btreplay: 22 btreplay/btreplay:
23- $(MAKE) -C btreplay 23- $(MAKE) -C btreplay
24+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" 24+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btreplay
25 25
26 %.o: %.c 26 %.o: %.c
27 $(CC) -o $*.o -c $(ALL_CFLAGS) $< 27 $(CC) -o $*.o -c $(ALL_CFLAGS) $<
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 5690f1463b..85e4a4b3ce 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
4 4
5DEPENDS = "libaio" 5DEPENDS = "libaio"
6 6
7PR = r0 7PR = r1
8PV = "1.0.1+git${SRCPV}" 8PV = "1.0.1+git${SRCPV}"
9 9
10SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \ 10SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \