2 files changed, 28 insertions, 0 deletions

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 0000000000..af1a7606c4
--- /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 fe6a35a274..2d2d55571b 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