Skip to contentSkip to conversation

Fix blktrace Makefile problem and re-enable blktrace recipe

PATCH Applied Tom Zanussi 2 participants 4 messages Dec 29, 2010 – Dec 30, 2010

lore
Share & tools
lore
#0 lore raw

cover Fix blktrace Makefile problem and re-enable blktrace recipe

This patchset fixes the build problem seen recently with blktrace; with that fixed, the blktrace recipe can then be re-enabled, which this patchset also does.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: tzanussi/blktrace-build-fixes
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=tzanussi/blktrace-build-fixes

Thanks,
Tom Zanussi <[email protected]>
---

Tom Zanussi (2):
blktrace: Fix parallel make issue
task-poky-tools.bb: re-enable blktrace

 meta/recipes-core/tasks/task-poky-tools.bb         |    1 +
 .../blktrace/blktrace/blktrace-makefile.patch      |    4 ++--
 meta/recipes-kernel/blktrace/blktrace_git.bb       |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
#1 lore raw

PATCH 1/2 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.

---
 .../blktrace/blktrace/blktrace-makefile.patch      |    4 ++--
 meta/recipes-kernel/blktrace/blktrace_git.bb       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch +2 -2
index 87ee24e..c6a06ed 100644
@@ -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) $<
meta/recipes-kernel/blktrace/blktrace_git.bb +1 -1
index 5690f14..85e4a4b 100644
@@ -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 \
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/2 task-poky-tools.bb: re-enable blktrace

In reply to Tom Zanussi

The commit for BUGID #581 fixes the blktrace build errors - it should now be safe to re-enable the blktrace recipe.

---
 meta/recipes-core/tasks/task-poky-tools.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-core/tasks/task-poky-tools.bb +1 -0
index e507ce4..60a95f9 100644
@@ -49,6 +49,7 @@ RRECOMMENDS_task-poky-tools-profile = "\
     perf \
     trace-cmd \
     kernel-module-oprofile \
+    blktrace \
     sysprof \
     "
 
Signature · 1 line
1.7.0.4
#3 lore raw
In reply to Tom Zanussi
Quoted 11 lines · Tom Zanussi

This patchset fixes the build problem seen recently with blktrace; with that fixed, the blktrace recipe can then be re-enabled, which this patchset also does.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: tzanussi/blktrace-build-fixes
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=tzanussi/blktrace-build-fixes

Thanks,
Tom Zanussi <[email protected]>
---

Merged into master, thanks.

Richard