diff options
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch | 27 |
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 @@ -btrfs-progs: fix parallel build - -Upstream-Status: Submitted [http://permalink.gmane.org/gmane.comp.file-systems.btrfs/28197] - -Parallel execution of "make install" may fail due to late creation of -version.h, fix it by adding the dependence on version.h. - -The fix is similare to 7aaf00fc[btrfs-progs: fix parallel build] - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index c43cb68..40ef205 100644 ---- a/Makefile -+++ b/Makefile -@@ -190,7 +190,7 @@ clean : - $(libs) $(lib_links) - $(Q)$(MAKE) $(MAKEOPTS) -C man $@ - --install: $(libs) $(progs) install-man -+install: version.h $(libs) $(progs) install-man - $(INSTALL) -m755 -d $(DESTDIR)$(bindir) - $(INSTALL) $(progs) $(DESTDIR)$(bindir) - $(INSTALL) -m755 -d $(DESTDIR)$(libdir) --- -1.7.10.4 - 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 @@ -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 $< |