summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-16 14:01:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 12:28:50 +0100
commit490431f8a4088343f40990c72aa28ef7b4add7f2 (patch)
tree70c10853e57a992bd82650ec3eaa992e98ad931f /meta
parenta00faba270e470aea0966208df3786e03912dc5b (diff)
downloadpoky-490431f8a4088343f40990c72aa28ef7b4add7f2.tar.gz
btrfs-tools: Upgrade 3.12 -> 3.14.2
(From OE-Core rev: da30d4cfe4b3cac12d09384ca27f9612b5288b48) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch58
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch22
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch31
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb9
4 files changed, 25 insertions, 95 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
deleted file mode 100644
index 695973eded..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
2
3The bug accurs when exec:
4 # mkfs.btrfs -r <a relative path> <device>
5 (note: the path should be 'valid' correspond to your `pwd`)
6error msg:
7 $ scandir for <a relative path> failed: No such file...
8
9Replace strdup() with realpath() to get the correct scan path.
10
11Upstream-Status: Backport (pending)
12
13Reported-by: Saul Wold <sgw@linux.intel.com>
14Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
15---
16 mkfs.c | 5 ++---
17 1 file changed, 2 insertions(+), 3 deletions(-)
18
19diff --git a/mkfs.c b/mkfs.c
20index 2dc90c2..1bd3069 100644
21--- a/mkfs.c
22+++ b/mkfs.c
23@@ -756,6 +756,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
24 ino_t parent_inum, cur_inum;
25 ino_t highest_inum = 0;
26 char *parent_dir_name;
27+ char real_path[PATH_MAX];
28 struct btrfs_path path;
29 struct extent_buffer *leaf;
30 struct btrfs_key root_dir_key;
31@@ -764,7 +765,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
32 /* Add list for source directory */
33 dir_entry = malloc(sizeof(struct directory_name_entry));
34 dir_entry->dir_name = dir_name;
35- dir_entry->path = strdup(dir_name);
36+ dir_entry->path = realpath(dir_name, real_path);
37
38 parent_inum = highest_inum + BTRFS_FIRST_FREE_OBJECTID;
39 dir_entry->inum = parent_inum;
40@@ -876,7 +877,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
41 }
42
43 free_namelist(files, count);
44- free(parent_dir_entry->path);
45 free(parent_dir_entry);
46
47 index_cnt = 2;
48@@ -887,7 +887,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
49 fail:
50 free_namelist(files, count);
51 fail_no_files:
52- free(parent_dir_entry->path);
53 free(parent_dir_entry);
54 return -1;
55 }
56--
571.8.1.4
58
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
new file mode 100644
index 0000000000..6df4e10a19
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
@@ -0,0 +1,22 @@
1Doc generation requires xmlto and ascidoc which we don't have right now.
2Disable doc generation until such times as we have the right dependencies.
3
4RP 2014/7/16
5
6Upstream-Status: Inappropriate
7
8Index: git/Makefile
9===================================================================
10--- git.orig/Makefile 2014-07-16 13:21:43.289386655 +0000
11+++ git/Makefile 2014-07-16 13:42:46.453421079 +0000
12@@ -57,8 +57,8 @@
13 btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype
14
15 SUBDIRS =
16-BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) build-Documentation
17-INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) install-Documentation
18+BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS))
19+INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS))
20 CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS))
21
22 .PHONY: $(SUBDIRS)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
deleted file mode 100644
index 9ca9fca3ee..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Pending
2
3Allow mandir to be set from the environment, fixing the following packaging warnings:
4
5WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package:
6WARNING: /usr/man/man8/btrfs-show.8.gz
7WARNING: /usr/man/man8/btrfs-image.8.gz
8WARNING: /usr/man/man8/btrfsctl.8.gz
9WARNING: /usr/man/man8/btrfs.8.gz
10WARNING: /usr/man/man8/btrfsck.8.gz
11WARNING: /usr/man/man8/mkfs.btrfs.8.gz
12
13RP - 5/7/2011
14
15Index: 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
index 8129cd5e99..0eed13bfb1 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -12,15 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
12SECTION = "base" 12SECTION = "base"
13DEPENDS = "util-linux attr e2fsprogs lzo acl" 13DEPENDS = "util-linux attr e2fsprogs lzo acl"
14 14
15SRCREV = "8cae1840afb3ea44dcc298f32983e577480dfee4" 15SRCREV = "24cf4d8c3ee924b474f68514e0167cc2e602a48d"
16SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \ 16SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \
17 file://weak-defaults.patch \ 17 file://nodocs.patch"
18 file://allow-relative-path.patch \
19 "
20
21S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
22 19
23PV = "3.12+git${SRCPV}" 20PV = "3.14.2+git${SRCPV}"
24 21
25 22
26do_install () { 23do_install () {