diff options
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/debian')
3 files changed, 0 insertions, 170 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 deleted file mode 100644 index b15a1c98ed..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/01-labels.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
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 | |||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/02-ftbfs.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/02-ftbfs.patch deleted file mode 100644 index 7b47190757..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/02-ftbfs.patch +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [distribution: debian] | ||
2 | |||
3 | Authors: | ||
4 | Luca Bruno <lucab@debian.org> | ||
5 | Alexander Kurtz <kurtz.alex@googlemail.com> | ||
6 | Daniel Baumann <daniel@debian.org> | ||
7 | Description: | ||
8 | Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha | ||
9 | and ia64 (Closes: #539433, #583768). | ||
10 | |||
11 | diff -Naurp btrfs-tools.orig/btrfsctl.c btrfs-tools/btrfsctl.c | ||
12 | --- btrfs-tools.orig/btrfsctl.c 2010-06-01 07:22:33.000000000 +0200 | ||
13 | +++ btrfs-tools/btrfsctl.c 2010-06-05 08:44:05.000000000 +0200 | ||
14 | @@ -234,7 +234,7 @@ int main(int ac, char **av) | ||
15 | args.fd = fd; | ||
16 | ret = ioctl(snap_fd, command, &args); | ||
17 | } else if (command == BTRFS_IOC_DEFAULT_SUBVOL) { | ||
18 | - printf("objectid is %llu\n", objectid); | ||
19 | + printf("objectid is %llu\n", (long long unsigned int) objectid); | ||
20 | ret = ioctl(fd, command, &objectid); | ||
21 | } else | ||
22 | ret = ioctl(fd, command, &args); | ||
23 | diff -Naurp btrfs-tools.orig/btrfs-list.c btrfs-tools/btrfs-list.c | ||
24 | --- btrfs-tools.orig/btrfs-list.c 2010-06-01 07:22:33.000000000 +0200 | ||
25 | +++ btrfs-tools/btrfs-list.c 2010-06-05 08:47:27.000000000 +0200 | ||
26 | @@ -248,8 +248,9 @@ static int resolve_root(struct root_look | ||
27 | break; | ||
28 | } | ||
29 | } | ||
30 | - printf("ID %llu top level %llu path %s\n", ri->root_id, top_id, | ||
31 | - full_path); | ||
32 | + printf("ID %llu top level %llu path %s\n", | ||
33 | + (long long unsigned int) ri->root_id, | ||
34 | + (long long unsigned int) top_id, full_path); | ||
35 | free(full_path); | ||
36 | return 0; | ||
37 | } | ||
38 | diff -Naurp btrfs-tools.orig/btrfs-map-logical.c btrfs-tools/btrfs-map-logical.c | ||
39 | --- btrfs-tools.orig/btrfs-map-logical.c 2010-06-01 07:22:33.000000000 +0200 | ||
40 | +++ btrfs-tools/btrfs-map-logical.c 2010-06-05 08:48:10.000000000 +0200 | ||
41 | @@ -65,8 +65,9 @@ struct extent_buffer *debug_read_block(s | ||
42 | eb->dev_bytenr = multi->stripes[0].physical; | ||
43 | |||
44 | fprintf(info_file, "mirror %d logical %Lu physical %Lu " | ||
45 | - "device %s\n", mirror_num, bytenr, eb->dev_bytenr, | ||
46 | - device->name); | ||
47 | + "device %s\n", mirror_num, | ||
48 | + (long long unsigned int) bytenr, | ||
49 | + (long long unsigned int) eb->dev_bytenr, device->name); | ||
50 | kfree(multi); | ||
51 | |||
52 | if (!copy || mirror_num == copy) | ||
53 | diff -Naurp btrfs-tools.orig/convert.c btrfs-tools/convert.c | ||
54 | --- btrfs-tools.orig/convert.c 2010-06-01 07:22:33.000000000 +0200 | ||
55 | +++ btrfs-tools/convert.c 2010-06-05 08:43:29.000000000 +0200 | ||
56 | @@ -2572,7 +2572,7 @@ int do_rollback(const char *devname, int | ||
57 | ext2_root = btrfs_read_fs_root(root->fs_info, &key); | ||
58 | if (!ext2_root || IS_ERR(ext2_root)) { | ||
59 | fprintf(stderr, "unable to open subvol %llu\n", | ||
60 | - key.objectid); | ||
61 | + (unsigned long long) key.objectid); | ||
62 | goto fail; | ||
63 | } | ||
64 | |||
65 | diff -Naurp btrfs-tools.orig/debug-tree.c btrfs-tools/debug-tree.c | ||
66 | --- btrfs-tools.orig/debug-tree.c 2010-06-01 07:22:33.000000000 +0200 | ||
67 | +++ btrfs-tools/debug-tree.c 2010-06-05 08:46:17.000000000 +0200 | ||
68 | @@ -162,7 +162,8 @@ int main(int ac, char **av) | ||
69 | root->nodesize, 0); | ||
70 | } | ||
71 | if (!leaf) { | ||
72 | - fprintf(stderr, "failed to read %llu\n", block_only); | ||
73 | + fprintf(stderr, "failed to read %llu\n", | ||
74 | + (long long unsigned int) block_only); | ||
75 | return 0; | ||
76 | } | ||
77 | btrfs_print_tree(root, leaf, 0); | ||
78 | diff -Naurp btrfs-tools.orig/disk-io.c btrfs-tools/disk-io.c | ||
79 | --- btrfs-tools.orig/disk-io.c 2010-06-01 07:18:01.000000000 +0200 | ||
80 | +++ btrfs-tools/disk-io.c 2010-06-05 08:43:29.000000000 +0200 | ||
81 | @@ -678,7 +678,8 @@ struct btrfs_root *open_ctree_fd(int fp, | ||
82 | ~BTRFS_FEATURE_INCOMPAT_SUPP; | ||
83 | if (features) { | ||
84 | printk("couldn't open because of unsupported " | ||
85 | - "option features (%Lx).\n", features); | ||
86 | + "option features (%Lx).\n", | ||
87 | + (unsigned long long)features); | ||
88 | BUG_ON(1); | ||
89 | } | ||
90 | |||
91 | @@ -692,7 +693,8 @@ struct btrfs_root *open_ctree_fd(int fp, | ||
92 | ~BTRFS_FEATURE_COMPAT_RO_SUPP; | ||
93 | if (writes && features) { | ||
94 | printk("couldn't open RDWR because of unsupported " | ||
95 | - "option features (%Lx).\n", features); | ||
96 | + "option features (%Lx).\n", | ||
97 | + (unsigned long long) features); | ||
98 | BUG_ON(1); | ||
99 | } | ||
100 | |||
101 | diff -Naurp btrfs-tools.orig/extent-tree.c btrfs-tools/extent-tree.c | ||
102 | --- btrfs-tools.orig/extent-tree.c 2010-06-01 07:18:01.000000000 +0200 | ||
103 | +++ btrfs-tools/extent-tree.c 2010-06-05 08:43:29.000000000 +0200 | ||
104 | @@ -1448,7 +1448,8 @@ int btrfs_lookup_extent_info(struct btrf | ||
105 | goto out; | ||
106 | if (ret != 0) { | ||
107 | btrfs_print_leaf(root, path->nodes[0]); | ||
108 | - printk("failed to find block number %Lu\n", bytenr); | ||
109 | + printk("failed to find block number %Lu\n", | ||
110 | + (unsigned long long) bytenr); | ||
111 | BUG(); | ||
112 | } | ||
113 | |||
114 | diff -Naurp btrfs-tools.orig/print-tree.c btrfs-tools/print-tree.c | ||
115 | --- btrfs-tools.orig/print-tree.c 2010-06-01 07:22:33.000000000 +0200 | ||
116 | +++ btrfs-tools/print-tree.c 2010-06-05 08:43:29.000000000 +0200 | ||
117 | @@ -494,7 +494,7 @@ void btrfs_print_leaf(struct btrfs_root | ||
118 | case BTRFS_DIR_LOG_ITEM_KEY: | ||
119 | dlog = btrfs_item_ptr(l, i, struct btrfs_dir_log_item); | ||
120 | printf("\t\tdir log end %Lu\n", | ||
121 | - btrfs_dir_log_end(l, dlog)); | ||
122 | + (unsigned long long) btrfs_dir_log_end(l, dlog)); | ||
123 | break; | ||
124 | case BTRFS_ORPHAN_ITEM_KEY: | ||
125 | printf("\t\torphan item\n"); | ||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/03-glibc.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/03-glibc.patch deleted file mode 100644 index dc26148f17..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/debian/03-glibc.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [distribution: debian] | ||
2 | |||
3 | Author: Colin Watson <cjwatson@debian.org> | ||
4 | Description: Fixes FTBFS with glibc 2.12 (Closes; #586111). | ||
5 | |||
6 | diff -Naurp btrfs-tools.orig//btrfsck.c btrfs-tools/btrfsck.c | ||
7 | --- btrfs-tools.orig//btrfsck.c 2010-06-05 09:06:38.000000000 +0200 | ||
8 | +++ btrfs-tools/btrfsck.c 2010-06-16 16:16:10.000000000 +0200 | ||
9 | @@ -21,6 +21,7 @@ | ||
10 | #include <stdio.h> | ||
11 | #include <stdlib.h> | ||
12 | #include <fcntl.h> | ||
13 | +#include <sys/stat.h> | ||
14 | #include "kerncompat.h" | ||
15 | #include "ctree.h" | ||
16 | #include "disk-io.h" | ||