From 3156e757f23c66b0afb679119dc1d1288492325a Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 29 Dec 2010 11:25:42 -0600 Subject: 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 --- meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch | 4 ++-- meta/recipes-kernel/blktrace/blktrace_git.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel/blktrace') 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 btreplay/btrecord: - $(MAKE) -C btreplay -+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" ++ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btrecord btreplay/btreplay: - $(MAKE) -C btreplay -+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" ++ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btreplay %.o: %.c $(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" DEPENDS = "libaio" -PR = r0 +PR = r1 PV = "1.0.1+git${SRCPV}" SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \ -- cgit v1.2.3-54-g00ecf