diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:38:32 +0100 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:50:20 +0100 |
commit | e2e6f6fe07049f33cb6348780fa975162752e421 (patch) | |
tree | b1813295411235d1297a0ed642b1346b24fdfb12 /meta/recipes-devtools/btrfs-tools | |
download | poky-e2e6f6fe07049f33cb6348780fa975162752e421.tar.gz |
initial commit of Enea Linux 3.1
Migrated from the internal git server on the dora-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
4 files changed, 118 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 @@ | |||
1 | btrfs-progs: fix parallel build | ||
2 | |||
3 | Upstream-Status: Submitted [http://permalink.gmane.org/gmane.comp.file-systems.btrfs/28197] | ||
4 | |||
5 | Parallel execution of "make install" may fail due to late creation of | ||
6 | version.h, fix it by adding the dependence on version.h. | ||
7 | |||
8 | The fix is similare to 7aaf00fc[btrfs-progs: fix parallel build] | ||
9 | |||
10 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
11 | --- | ||
12 | Makefile | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index 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 | -- | ||
29 | 1.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 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 @@ | |||
1 | btrfs-progs: Fix parallel build | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | "make btrfs.o" fails unable to find version.h. | ||
6 | |||
7 | This adds version.h as a dependency for all .o files and fixes various parallel | ||
8 | build failures. | ||
9 | |||
10 | RP 20/9/2013 | ||
11 | --- | ||
12 | Makefile | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | Index: 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/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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Allow mandir to be set from the environment, fixing the following packaging warnings: | ||
4 | |||
5 | WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package: | ||
6 | WARNING: /usr/man/man8/btrfs-show.8.gz | ||
7 | WARNING: /usr/man/man8/btrfs-image.8.gz | ||
8 | WARNING: /usr/man/man8/btrfsctl.8.gz | ||
9 | WARNING: /usr/man/man8/btrfs.8.gz | ||
10 | WARNING: /usr/man/man8/btrfsck.8.gz | ||
11 | WARNING: /usr/man/man8/mkfs.btrfs.8.gz | ||
12 | |||
13 | RP - 5/7/2011 | ||
14 | |||
15 | Index: git/man/Makefile | ||
16 | =================================================================== | ||
17 | --- git.orig/man/Makefile 2011-07-05 22:03:58.949919067 +0100 | ||
18 | +++ git/man/Makefile 2011-07-05 22:04:07.789919856 +0100 | ||
19 | @@ -2,9 +2,9 @@ | ||
20 | INSTALL= install | ||
21 | |||
22 | prefix ?= /usr/local | ||
23 | -bindir = $(prefix)/bin | ||
24 | -mandir = $(prefix)/man | ||
25 | -man8dir = $(mandir)/man8 | ||
26 | +bindir ?= $(prefix)/bin | ||
27 | +mandir ?= $(prefix)/man | ||
28 | +man8dir ?= $(mandir)/man8 | ||
29 | |||
30 | MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \ | ||
31 | btrfs-show.8.gz btrfs.8.gz | ||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb new file mode 100644 index 0000000000..2d2d55571b --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | SUMMARY = "Checksumming Copy on Write Filesystem utilities" | ||
2 | DESCRIPTION = "Btrfs is a new copy on write filesystem for Linux aimed at \ | ||
3 | implementing advanced features while focusing on fault tolerance, repair and \ | ||
4 | easy administration. \ | ||
5 | This package contains utilities (mkfs, fsck, btrfsctl) used to work with \ | ||
6 | btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3." | ||
7 | |||
8 | HOMEPAGE = "https://btrfs.wiki.kernel.org" | ||
9 | |||
10 | LICENSE = "GPLv2" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" | ||
12 | SECTION = "base" | ||
13 | DEPENDS = "util-linux attr e2fsprogs lzo acl" | ||
14 | |||
15 | SRCREV = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f" | ||
16 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | PV = "0.20+git${SRCPV}" | ||
21 | |||
22 | SRC_URI += "file://weak-defaults.patch" | ||
23 | SRC_URI += "file://btrfs-progs-fix-parallel-build.patch" | ||
24 | SRC_URI += "file://btrfs-progs-fix-parallel-build2.patch" | ||
25 | |||
26 | do_install () { | ||
27 | oe_runmake 'DESTDIR=${D}' install | ||
28 | } | ||
29 | |||
30 | BBCLASSEXTEND = "native" | ||