Patchwork btrfs-tools: Fix parallel make issue

login
register
mail settings
Submitter Richard Purdie
Date Sept. 20, 2013, 4:16 p.m.
Message ID <1379693778.18603.151.camel@ted>
Download mbox | patch
Permalink /patch/58445/
State Accepted
Commit f4276141088fc848675af5c5267680747312eed3
Headers show

Comments

Richard Purdie - Sept. 20, 2013, 4:16 p.m.
btrfs-tools was failing occasionally due to version.h being missing. This
fixes the problems, thanks to several people on #yocto for helping out
why my lack of make knowledge of old fashioned suffix rules :)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch
new file mode 100644
index 0000000..af1a760
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch
@@ -0,0 +1,27 @@ 
+btrfs-progs: Fix parallel build
+
+Upstream-Status: Pending
+
+"make btrfs.o" fails unable to find version.h.
+
+This adds version.h as a dependency for all .o files and fixes various parallel 
+build failures.
+
+RP 20/9/2013
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile	2013-09-20 14:45:34.307723221 +0000
++++ git/Makefile	2013-09-20 16:06:45.503611030 +0000
+@@ -76,7 +76,7 @@
+ 	check = true
+ endif
+ 
+-.c.o:
++%.o: %.c version.h
+ 	$(Q)$(check) $<
+ 	@echo "    [CC]     $@"
+ 	$(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index fe6a35a..2d2d555 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -21,6 +21,7 @@  PV = "0.20+git${SRCPV}"
 
 SRC_URI += "file://weak-defaults.patch"
 SRC_URI += "file://btrfs-progs-fix-parallel-build.patch"
+SRC_URI += "file://btrfs-progs-fix-parallel-build2.patch"
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install