summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools
diff options
context:
space:
mode:
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/btrfs-progs-fix-parallel-build2.patch27
2 files changed, 0 insertions, 57 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
deleted file mode 100644
index e461cdf447..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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/btrfs-progs-fix-parallel-build2.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch
deleted file mode 100644
index af1a7606c4..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
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 $<