diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-06-09 18:12:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-30 20:56:35 +0100 |
commit | 0c10be57b72901464d4bb9ea7b5383c42b08bcae (patch) | |
tree | 78e8746ac8215577208ce658bfb8001f43d9a6b9 /meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0003-Btrfs-progs-utils-Informative-errors.patch | |
parent | 64497638e70c97f417c2bcdaf99ffcc843ad58ec (diff) | |
download | poky-0c10be57b72901464d4bb9ea7b5383c42b08bcae.tar.gz |
btrfs-tools: new recipe for tools to operate on btrfs images
Added these patches to the recipe to get it to work as desired:
Upstream patches from tmp & for-dragonn branches of repository http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git
Also included the debian patches.
Nitin's patch to make the makefile cross friendly
And Xin Zhong's patch to improve mkfs.btrfs
(From OE-Core rev: 57a2140dc9673c65fea088fbd024fbd002e6937b)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0003-Btrfs-progs-utils-Informative-errors.patch')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0003-Btrfs-progs-utils-Informative-errors.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0003-Btrfs-progs-utils-Informative-errors.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0003-Btrfs-progs-utils-Informative-errors.patch new file mode 100644 index 0000000000..afc810573f --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0003-Btrfs-progs-utils-Informative-errors.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Inappropriate [Backport] | ||
2 | From ac1a80f52434d05230f9933d8f68e28cc09e10b0 Mon Sep 17 00:00:00 2001 | ||
3 | From: Goldwyn Rodrigues <rgoldwyn@gmail.com> | ||
4 | Date: Mon, 7 Feb 2011 07:34:36 +0000 | ||
5 | Subject: [PATCH 03/15] Btrfs-progs utils Informative errors | ||
6 | |||
7 | Signed-off-by: Chris Mason <chris.mason@oracle.com> | ||
8 | --- | ||
9 | utils.c | 5 +++-- | ||
10 | 1 files changed, 3 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/utils.c b/utils.c | ||
13 | index 96ef94d..d8c3dcc 100644 | ||
14 | --- a/utils.c | ||
15 | +++ b/utils.c | ||
16 | @@ -867,7 +867,7 @@ again: | ||
17 | } | ||
18 | dirp = opendir(dirname); | ||
19 | if (!dirp) { | ||
20 | - fprintf(stderr, "Unable to open /sys/block for scanning\n"); | ||
21 | + fprintf(stderr, "Unable to open %s for scanning\n", dirname); | ||
22 | return -ENOENT; | ||
23 | } | ||
24 | while(1) { | ||
25 | @@ -902,7 +902,8 @@ again: | ||
26 | } | ||
27 | fd = open(fullpath, O_RDONLY); | ||
28 | if (fd < 0) { | ||
29 | - fprintf(stderr, "failed to read %s\n", fullpath); | ||
30 | + fprintf(stderr, "failed to read %s: %s\n", fullpath, | ||
31 | + strerror(errno)); | ||
32 | continue; | ||
33 | } | ||
34 | ret = btrfs_scan_one_device(fd, fullpath, &tmp_devices, | ||
35 | -- | ||
36 | 1.7.2.3 | ||
37 | |||