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/debian/01-labels.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/debian/01-labels.patch')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/01-labels.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/01-labels.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/01-labels.patch new file mode 100644 index 0000000000..b15a1c98ed --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/01-labels.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Inappropriate [distribution: debian] | ||
2 | |||
3 | Author: Chris Mason <chris.mason@oracle.com> | ||
4 | Description: Allow /'s in labels. | ||
5 | |||
6 | diff -Naurp btrfs-tools.orig/mkfs.c btrfs-tools/mkfs.c | ||
7 | --- btrfs-tools.orig/mkfs.c 2009-03-15 13:27:12.000000000 +0100 | ||
8 | +++ btrfs-tools/mkfs.c 2009-04-17 20:53:12.000000000 +0200 | ||
9 | @@ -294,7 +294,6 @@ static u64 parse_profile(char *s) | ||
10 | |||
11 | static char *parse_label(char *input) | ||
12 | { | ||
13 | - int i; | ||
14 | int len = strlen(input); | ||
15 | |||
16 | if (len > BTRFS_LABEL_SIZE) { | ||
17 | @@ -302,12 +301,6 @@ static char *parse_label(char *input) | ||
18 | BTRFS_LABEL_SIZE); | ||
19 | exit(1); | ||
20 | } | ||
21 | - for (i = 0; i < len; i++) { | ||
22 | - if (input[i] == '/' || input[i] == '\\') { | ||
23 | - fprintf(stderr, "invalid label %s\n", input); | ||
24 | - exit(1); | ||
25 | - } | ||
26 | - } | ||
27 | return strdup(input); | ||
28 | } | ||
29 | |||