summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-20 16:12:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:43 +0100
commitf4276141088fc848675af5c5267680747312eed3 (patch)
tree87b33afb34ade56a0cdaeb46c1c5c45d14e57da6
parent5262ea16a626d8b39bfe745d6d51dc0bfe5ea499 (diff)
downloadpoky-f4276141088fc848675af5c5267680747312eed3.tar.gz
btrfs-tools: Fix parallel make issue
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 :) (From OE-Core rev: 7be8010186889cece97829025d97d94f21c1f2e5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch27
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb1
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 @@
1btrfs-progs: Fix parallel build
2
3Upstream-Status: Pending
4
5"make btrfs.o" fails unable to find version.h.
6
7This adds version.h as a dependency for all .o files and fixes various parallel
8build failures.
9
10RP 20/9/2013
11---
12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15Index: git/Makefile
16===================================================================
17--- git.orig/Makefile 2013-09-20 14:45:34.307723221 +0000
18+++ git/Makefile 2013-09-20 16:06:45.503611030 +0000
19@@ -76,7 +76,7 @@
20 check = true
21 endif
22
23-.c.o:
24+%.o: %.c version.h
25 $(Q)$(check) $<
26 @echo " [CC] $@"
27 $(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}"
21 21
22SRC_URI += "file://weak-defaults.patch" 22SRC_URI += "file://weak-defaults.patch"
23SRC_URI += "file://btrfs-progs-fix-parallel-build.patch" 23SRC_URI += "file://btrfs-progs-fix-parallel-build.patch"
24SRC_URI += "file://btrfs-progs-fix-parallel-build2.patch"
24 25
25do_install () { 26do_install () {
26 oe_runmake 'DESTDIR=${D}' install 27 oe_runmake 'DESTDIR=${D}' install