From e2e6f6fe07049f33cb6348780fa975162752e421 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Thu, 12 Dec 2013 13:38:32 +0100 Subject: initial commit of Enea Linux 3.1 Migrated from the internal git server on the dora-enea branch Signed-off-by: Adrian Dudau --- .../btrfs-progs-fix-parallel-build.patch | 30 +++++++++++++++++++++ .../btrfs-progs-fix-parallel-build2.patch | 27 +++++++++++++++++++ .../btrfs-tools/btrfs-tools/weak-defaults.patch | 31 ++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build.patch create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/btrfs-progs-fix-parallel-build2.patch create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools') 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 @@ +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 +--- + 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 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/weak-defaults.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch new file mode 100644 index 0000000000..9ca9fca3ee --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch @@ -0,0 +1,31 @@ +Upstream-Status: Pending + +Allow mandir to be set from the environment, fixing the following packaging warnings: + +WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package: +WARNING: /usr/man/man8/btrfs-show.8.gz +WARNING: /usr/man/man8/btrfs-image.8.gz +WARNING: /usr/man/man8/btrfsctl.8.gz +WARNING: /usr/man/man8/btrfs.8.gz +WARNING: /usr/man/man8/btrfsck.8.gz +WARNING: /usr/man/man8/mkfs.btrfs.8.gz + +RP - 5/7/2011 + +Index: git/man/Makefile +=================================================================== +--- git.orig/man/Makefile 2011-07-05 22:03:58.949919067 +0100 ++++ git/man/Makefile 2011-07-05 22:04:07.789919856 +0100 +@@ -2,9 +2,9 @@ + INSTALL= install + + prefix ?= /usr/local +-bindir = $(prefix)/bin +-mandir = $(prefix)/man +-man8dir = $(mandir)/man8 ++bindir ?= $(prefix)/bin ++mandir ?= $(prefix)/man ++man8dir ?= $(mandir)/man8 + + MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \ + btrfs-show.8.gz btrfs.8.gz -- cgit v1.2.3-54-g00ecf