summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2013-09-10 17:24:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-10 23:00:50 +0100
commitf7d1286fe84a4886ef13616eebe86f4bd8e06bd8 (patch)
tree068b161950aafd7556f648db067f0cb48cfd61af /meta/recipes-devtools/btrfs-tools
parenta5973acca3224d64dd80a626febe5d84bd2e3bc4 (diff)
downloadpoky-f7d1286fe84a4886ef13616eebe86f4bd8e06bd8.tar.gz
btrfs-tools: fix a parallel build issue
(From OE-Core rev: 637e0484ea4e7a39ac4d9c407c585201e6be1bc0) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build.patch30
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build.patch
new file mode 100644
index 0000000000..e461cdf447
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build.patch
@@ -0,0 +1,30 @@
1btrfs-progs: fix parallel build
2
3Upstream-Status: Submitted [http://permalink.gmane.org/gmane.comp.file-systems.btrfs/28197]
4
5Parallel execution of "make install" may fail due to late creation of
6version.h, fix it by adding the dependence on version.h.
7
8The fix is similare to 7aaf00fc[btrfs-progs: fix parallel build]
9
10Signed-off-by: Roy.Li <rongqing.li@windriver.com>
11---
12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Makefile b/Makefile
16index c43cb68..40ef205 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -190,7 +190,7 @@ clean :
20 $(libs) $(lib_links)
21 $(Q)$(MAKE) $(MAKEOPTS) -C man $@
22
23-install: $(libs) $(progs) install-man
24+install: version.h $(libs) $(progs) install-man
25 $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
26 $(INSTALL) $(progs) $(DESTDIR)$(bindir)
27 $(INSTALL) -m755 -d $(DESTDIR)$(libdir)
28--
291.7.10.4
30
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index 1c7f34f8d7..fe6a35a274 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -20,6 +20,7 @@ S = "${WORKDIR}/git"
20PV = "0.20+git${SRCPV}" 20PV = "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"
23 24
24do_install () { 25do_install () {
25 oe_runmake 'DESTDIR=${D}' install 26 oe_runmake 'DESTDIR=${D}' install