mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-08 03:20:47 +00:00
Code Issues Projects Releases Wiki Activity

btrfs: patch to allow for relative paths

Browse Source 
This seems to address the btrfs image failure

[YOCTO #5146]

(From OE-Core rev: 9b22b32863f9110522362706a28036cc945201d5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2014-03-11 15:26:21 +00:00
committed by Richard Purdie
parent 5ab5b77999
commit 24d17244d4
2 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch
+58
View File
@@ -0,0 +1,58 @@
From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
The bug accurs when exec:
# mkfs.btrfs -r <a relative path> <device>
(note: the path should be 'valid' correspond to your `pwd`)
error msg:
$ scandir for <a relative path> failed: No such file...
Replace strdup() with realpath() to get the correct scan path.
Upstream-Status: Backport (pending)
Reported-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
---
mkfs.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/mkfs.c b/mkfs.c
index 2dc90c2..1bd3069 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -756,6 +756,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
ino_t parent_inum, cur_inum;
ino_t highest_inum = 0;
char *parent_dir_name;
+ char real_path[PATH_MAX];
struct btrfs_path path;
struct extent_buffer *leaf;
struct btrfs_key root_dir_key;
@@ -764,7 +765,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
/* Add list for source directory */
dir_entry = malloc(sizeof(struct directory_name_entry));
dir_entry->dir_name = dir_name;
- dir_entry->path = strdup(dir_name);
+ dir_entry->path = realpath(dir_name, real_path);
parent_inum = highest_inum + BTRFS_FIRST_FREE_OBJECTID;
dir_entry->inum = parent_inum;
@@ -876,7 +877,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
}
free_namelist(files, count);
- free(parent_dir_entry->path);
free(parent_dir_entry);
index_cnt = 2;
@@ -887,7 +887,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
fail:
free_namelist(files, count);
fail_no_files:
- free(parent_dir_entry->path);
free(parent_dir_entry);
return -1;
}
--
1.8.1.4
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+3 -1
View File
@@ -14,7 +14,9 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
SRCREV = "8cae1840afb3ea44dcc298f32983e577480dfee4"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \
file://weak-defaults.patch"
file://weak-defaults.patch \
file://allow-relative-path.patch \
"
S = "${WORKDIR}/git"