From ae5d093ebc828966639a772e545baf84d55f391fb5aaef433b06e099c67f3456 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 29 Nov 2014 07:39:46 +0000 Subject: [PATCH] Accepting request 263016 from filesystems Fixed the conditinal sources. OBS-URL: https://build.opensuse.org/request/show/263016 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=49 --- ...ance-the-command-btrfs-filesystem-df.patch | 77 +++++++-------- ...helpers-functions-to-handle-the-prin.patch | 31 +++--- ...original-df-and-rename-disk_usage-to.patch | 61 ++++++------ ...trfs-progs-fix-linking-with-libbtrfs.patch | 39 -------- ...trfs-make-exported-headers-compatibl.patch | 99 ------------------- btrfs-progs-v3.17.2.tar.gz | 3 + btrfs-progs-v3.17.tar.gz | 3 - btrfsprogs.changes | 37 +++++++ btrfsprogs.spec | 26 +++-- fix-doc-build-on-SLE11SP3.diff | 20 ++++ local-version-override.patch | 4 +- 11 files changed, 158 insertions(+), 242 deletions(-) delete mode 100644 0042-btrfs-progs-fix-linking-with-libbtrfs.patch delete mode 100644 0043-btrfs-progs-libbtrfs-make-exported-headers-compatibl.patch create mode 100644 btrfs-progs-v3.17.2.tar.gz delete mode 100644 btrfs-progs-v3.17.tar.gz create mode 100644 fix-doc-build-on-SLE11SP3.diff diff --git a/0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch b/0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch index e38716f..4f2149f 100644 --- a/0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch +++ b/0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch @@ -22,24 +22,23 @@ Signed-off-by: David Sterba create mode 100644 cmds-fi-disk_usage.c create mode 100644 cmds-fi-disk_usage.h -diff --git a/Makefile b/Makefile -index 9c69adae9050..a6c1ccede7c4 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,7 +15,7 @@ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ +Index: btrfs-progs-v3.17.1/Makefile +=================================================================== +--- btrfs-progs-v3.17.1.orig/Makefile ++++ btrfs-progs-v3.17.1/Makefile +@@ -15,7 +15,7 @@ cmds_objects = cmds-subvolume.o cmds-fil cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \ cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \ cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \ - cmds-property.o + cmds-property.o cmds-fi-disk_usage.o libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \ - uuid-tree.o utils-lib.o + uuid-tree.o utils-lib.o rbtree-utils.o libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \ -diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c -new file mode 100644 -index 000000000000..7f4415666bd8 +Index: btrfs-progs-v3.17.1/cmds-fi-disk_usage.c +=================================================================== --- /dev/null -+++ b/cmds-fi-disk_usage.c ++++ btrfs-progs-v3.17.1/cmds-fi-disk_usage.c @@ -0,0 +1,516 @@ +/* + * This program is free software; you can redistribute it and/or @@ -557,11 +556,10 @@ index 000000000000..7f4415666bd8 + return 0; +} + -diff --git a/cmds-fi-disk_usage.h b/cmds-fi-disk_usage.h -new file mode 100644 -index 000000000000..9f68bb342d52 +Index: btrfs-progs-v3.17.1/cmds-fi-disk_usage.h +=================================================================== --- /dev/null -+++ b/cmds-fi-disk_usage.h ++++ btrfs-progs-v3.17.1/cmds-fi-disk_usage.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2007 Oracle. All rights reserved. @@ -588,10 +586,10 @@ index 000000000000..9f68bb342d52 +int cmd_filesystem_df(int argc, char **argv); + +#endif -diff --git a/cmds-filesystem.c b/cmds-filesystem.c -index ffa939c5b89a..91e4e2e5a881 100644 ---- a/cmds-filesystem.c -+++ b/cmds-filesystem.c +Index: btrfs-progs-v3.17.1/cmds-filesystem.c +=================================================================== +--- btrfs-progs-v3.17.1.orig/cmds-filesystem.c ++++ btrfs-progs-v3.17.1/cmds-filesystem.c @@ -36,6 +36,7 @@ #include "volumes.h" #include "version.h" @@ -600,7 +598,7 @@ index ffa939c5b89a..91e4e2e5a881 100644 #include "list_sort.h" #include "disk-io.h" -@@ -112,6 +113,7 @@ static const char * const filesystem_cmd_group_usage[] = { +@@ -121,6 +122,7 @@ static const char * const filesystem_cmd NULL }; @@ -608,15 +606,15 @@ index ffa939c5b89a..91e4e2e5a881 100644 static const char * const cmd_df_usage[] = { "btrfs filesystem df [options] ", "Show space usage information for a mount point", -@@ -126,6 +128,7 @@ static const char * const cmd_df_usage[] = { - "-t|--tbytes show sizes in TiB, or tB with --si", +@@ -135,6 +137,7 @@ static const char * const cmd_df_usage[] + "-t|--tbytes show sizes in TiB, or TB with --si", NULL }; +#endif static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) { -@@ -175,6 +178,7 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) +@@ -184,6 +187,7 @@ static int get_df(int fd, struct btrfs_i return 0; } @@ -624,7 +622,7 @@ index ffa939c5b89a..91e4e2e5a881 100644 static void print_df(struct btrfs_ioctl_space_args *sargs, unsigned unit_mode) { u64 i; -@@ -269,6 +273,7 @@ static int cmd_df(int argc, char **argv) +@@ -277,6 +281,7 @@ static int cmd_df(int argc, char **argv) close_file_or_dir(fd, dirstream); return !!ret; } @@ -632,7 +630,7 @@ index ffa939c5b89a..91e4e2e5a881 100644 static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label, char *search) -@@ -1263,7 +1268,7 @@ static int cmd_label(int argc, char **argv) +@@ -1275,7 +1280,7 @@ static int cmd_label(int argc, char **ar const struct cmd_group filesystem_cmd_group = { filesystem_cmd_group_usage, NULL, { @@ -641,10 +639,10 @@ index ffa939c5b89a..91e4e2e5a881 100644 { "show", cmd_show, cmd_show_usage, NULL, 0 }, { "sync", cmd_sync, cmd_sync_usage, NULL, 0 }, { "defragment", cmd_defrag, cmd_defrag_usage, NULL, 0 }, -diff --git a/ctree.h b/ctree.h -index 89036defc396..5a60bd268871 100644 ---- a/ctree.h -+++ b/ctree.h +Index: btrfs-progs-v3.17.1/ctree.h +=================================================================== +--- btrfs-progs-v3.17.1.orig/ctree.h ++++ btrfs-progs-v3.17.1/ctree.h @@ -842,9 +842,10 @@ struct btrfs_csum_item { #define BTRFS_BLOCK_GROUP_RAID1 (1ULL << 4) #define BTRFS_BLOCK_GROUP_DUP (1ULL << 5) @@ -658,10 +656,10 @@ index 89036defc396..5a60bd268871 100644 #define BTRFS_BLOCK_GROUP_TYPE_MASK (BTRFS_BLOCK_GROUP_DATA | \ BTRFS_BLOCK_GROUP_SYSTEM | \ -diff --git a/utils.c b/utils.c -index 43b693c94039..cf0559d9c9dd 100644 ---- a/utils.c -+++ b/utils.c +Index: btrfs-progs-v3.17.1/utils.c +=================================================================== +--- btrfs-progs-v3.17.1.orig/utils.c ++++ btrfs-progs-v3.17.1/utils.c @@ -38,6 +38,8 @@ #include #include @@ -671,7 +669,7 @@ index 43b693c94039..cf0559d9c9dd 100644 #include "kerncompat.h" #include "radix-tree.h" #include "ctree.h" -@@ -2475,3 +2477,12 @@ char* btrfs_group_profile_str(u64 flag) +@@ -2493,3 +2495,12 @@ char* btrfs_group_profile_str(u64 flag) } } @@ -684,11 +682,11 @@ index 43b693c94039..cf0559d9c9dd 100644 + else + return sfs.f_bsize * sfs.f_blocks; +} -diff --git a/utils.h b/utils.h -index 0d202f6344c4..2976e11d7a93 100644 ---- a/utils.h -+++ b/utils.h -@@ -133,6 +133,7 @@ int find_mount_root(const char *path, char **mount_root); +Index: btrfs-progs-v3.17.1/utils.h +=================================================================== +--- btrfs-progs-v3.17.1.orig/utils.h ++++ btrfs-progs-v3.17.1/utils.h +@@ -134,6 +134,7 @@ int find_mount_root(const char *path, ch int get_device_info(int fd, u64 devid, struct btrfs_ioctl_dev_info_args *di_args); int test_uuid_unique(char *fs_uuid); @@ -696,6 +694,3 @@ index 0d202f6344c4..2976e11d7a93 100644 int test_minimum_size(const char *file, u32 leafsize); int test_issubvolname(const char *name); --- -2.1.1 - diff --git a/0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch b/0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch index ce56648..935bbd0 100644 --- a/0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch +++ b/0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch @@ -39,24 +39,23 @@ Signed-off-by: David Sterba create mode 100644 string-table.c create mode 100644 string-table.h -diff --git a/Makefile b/Makefile -index a6c1ccede7c4..7f76447e3c55 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,7 @@ objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \ +Index: btrfs-progs-v3.17.1/Makefile +=================================================================== +--- btrfs-progs-v3.17.1.orig/Makefile ++++ btrfs-progs-v3.17.1/Makefile +@@ -10,7 +10,7 @@ objects = ctree.o disk-io.o radix-tree.o root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \ extent-cache.o extent_io.o volumes.o utils.o repair.o \ qgroup.o raid6.o free-space-cache.o list_sort.o props.o \ -- ulist.o qgroup-verify.o backref.o rbtree-utils.o -+ ulist.o qgroup-verify.o backref.o rbtree-utils.o string-table.o +- ulist.o qgroup-verify.o backref.o ++ ulist.o qgroup-verify.o backref.o string-table.o cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \ cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \ -diff --git a/string-table.c b/string-table.c -new file mode 100644 -index 000000000000..701f2147a3cc +Index: btrfs-progs-v3.17.1/string-table.c +=================================================================== --- /dev/null -+++ b/string-table.c ++++ btrfs-progs-v3.17.1/string-table.c @@ -0,0 +1,156 @@ +/* + * This program is free software; you can redistribute it and/or @@ -214,11 +213,10 @@ index 000000000000..701f2147a3cc + free(tab); + +} -diff --git a/string-table.h b/string-table.h -new file mode 100644 -index 000000000000..83c4425d5f76 +Index: btrfs-progs-v3.17.1/string-table.h +=================================================================== --- /dev/null -+++ b/string-table.h ++++ btrfs-progs-v3.17.1/string-table.h @@ -0,0 +1,36 @@ +/* + * This program is free software; you can redistribute it and/or @@ -256,6 +254,3 @@ index 000000000000..83c4425d5f76 +void table_free(struct string_table *); + +#endif --- -2.1.1 - diff --git a/0019-btrfs-progs-add-original-df-and-rename-disk_usage-to.patch b/0019-btrfs-progs-add-original-df-and-rename-disk_usage-to.patch index 162b70d..c74a794 100644 --- a/0019-btrfs-progs-add-original-df-and-rename-disk_usage-to.patch +++ b/0019-btrfs-progs-add-original-df-and-rename-disk_usage-to.patch @@ -16,11 +16,11 @@ Signed-off-by: David Sterba cmds-filesystem.c | 16 ++++------ 3 files changed, 24 insertions(+), 84 deletions(-) -diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c -index 9fd59bc1b5ae..683d6fb36de4 100644 ---- a/cmds-fi-disk_usage.c -+++ b/cmds-fi-disk_usage.c -@@ -328,6 +328,8 @@ static struct btrfs_ioctl_space_args *load_space_info(int fd, char *path) +Index: btrfs-progs-v3.17.1/cmds-fi-disk_usage.c +=================================================================== +--- btrfs-progs-v3.17.1.orig/cmds-fi-disk_usage.c ++++ btrfs-progs-v3.17.1/cmds-fi-disk_usage.c +@@ -328,6 +328,8 @@ static struct btrfs_ioctl_space_args *lo return sargs; } @@ -93,7 +93,7 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 /* * Helper to sort the disk_info structure -@@ -612,10 +559,10 @@ static u64 calc_chunk_size(struct chunk_info *ci) +@@ -612,10 +559,10 @@ static u64 calc_chunk_size(struct chunk_ } /* @@ -106,7 +106,7 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 struct btrfs_ioctl_space_args *sargs, struct chunk_info *chunks_info_ptr, int chunks_info_count, -@@ -795,10 +742,10 @@ static void print_chunk_disks(u64 chunk_type, +@@ -795,10 +742,10 @@ static void print_chunk_disks(u64 chunk_ } /* @@ -119,7 +119,7 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 struct btrfs_ioctl_space_args *sargs, struct chunk_info *info_ptr, int info_count, -@@ -839,7 +786,7 @@ static void _cmd_filesystem_disk_usage_linear(int mode, +@@ -839,7 +786,7 @@ static void _cmd_filesystem_disk_usage_l } @@ -128,7 +128,7 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 { struct btrfs_ioctl_space_args *sargs = 0; int info_count = 0; -@@ -860,11 +807,11 @@ static int _cmd_filesystem_disk_usage(int fd, char *path, int mode, int tabular) +@@ -860,11 +807,11 @@ static int _cmd_filesystem_disk_usage(in } if (tabular) @@ -153,7 +153,7 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 "Show in which disk the chunks are allocated.", "", "-b\tSet byte as unit", -@@ -889,7 +836,7 @@ const char * const cmd_filesystem_disk_usage_usage[] = { +@@ -889,7 +836,7 @@ const char * const cmd_filesystem_disk_u NULL }; @@ -162,7 +162,7 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 { int flags = DF_HUMAN_UNIT; -@@ -909,12 +856,12 @@ int cmd_filesystem_disk_usage(int argc, char **argv) +@@ -909,12 +856,12 @@ int cmd_filesystem_disk_usage(int argc, tabular = 1; break; default: @@ -177,7 +177,7 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 for (i = optind; i < argc ; i++) { int r, fd; -@@ -928,7 +875,7 @@ int cmd_filesystem_disk_usage(int argc, char **argv) +@@ -928,7 +875,7 @@ int cmd_filesystem_disk_usage(int argc, argv[1]); return 12; } @@ -186,10 +186,10 @@ index 9fd59bc1b5ae..683d6fb36de4 100644 close_file_or_dir(fd, dirstream); if (r) -diff --git a/cmds-fi-disk_usage.h b/cmds-fi-disk_usage.h -index c315004cd806..95cf4aabefb4 100644 ---- a/cmds-fi-disk_usage.h -+++ b/cmds-fi-disk_usage.h +Index: btrfs-progs-v3.17.1/cmds-fi-disk_usage.h +=================================================================== +--- btrfs-progs-v3.17.1.orig/cmds-fi-disk_usage.h ++++ btrfs-progs-v3.17.1/cmds-fi-disk_usage.h @@ -19,11 +19,8 @@ #ifndef __CMDS_FI_DISK_USAGE__ #define __CMDS_FI_DISK_USAGE__ @@ -204,11 +204,11 @@ index c315004cd806..95cf4aabefb4 100644 extern const char * const cmd_device_disk_usage_usage[]; int cmd_device_disk_usage(int argc, char **argv); -diff --git a/cmds-filesystem.c b/cmds-filesystem.c -index 43d5c31dcbb0..6626c7c9eaa2 100644 ---- a/cmds-filesystem.c -+++ b/cmds-filesystem.c -@@ -113,8 +113,7 @@ static const char * const filesystem_cmd_group_usage[] = { +Index: btrfs-progs-v3.17.1/cmds-filesystem.c +=================================================================== +--- btrfs-progs-v3.17.1.orig/cmds-filesystem.c ++++ btrfs-progs-v3.17.1/cmds-filesystem.c +@@ -122,8 +122,7 @@ static const char * const filesystem_cmd NULL }; @@ -218,15 +218,15 @@ index 43d5c31dcbb0..6626c7c9eaa2 100644 "btrfs filesystem df [options] ", "Show space usage information for a mount point", "-b|--raw raw numbers in bytes", -@@ -128,7 +127,6 @@ static const char * const cmd_df_usage[] = { - "-t|--tbytes show sizes in TiB, or tB with --si", +@@ -137,7 +136,6 @@ static const char * const cmd_df_usage[] + "-t|--tbytes show sizes in TiB, or TB with --si", NULL }; -#endif static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) { -@@ -178,7 +176,6 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) +@@ -187,7 +185,6 @@ static int get_df(int fd, struct btrfs_i return 0; } @@ -234,7 +234,7 @@ index 43d5c31dcbb0..6626c7c9eaa2 100644 static void print_df(struct btrfs_ioctl_space_args *sargs, unsigned unit_mode) { u64 i; -@@ -193,7 +190,7 @@ static void print_df(struct btrfs_ioctl_space_args *sargs, unsigned unit_mode) +@@ -202,7 +199,7 @@ static void print_df(struct btrfs_ioctl_ } } @@ -243,7 +243,7 @@ index 43d5c31dcbb0..6626c7c9eaa2 100644 { struct btrfs_ioctl_space_args *sargs = NULL; int ret; -@@ -247,12 +244,12 @@ static int cmd_df(int argc, char **argv) +@@ -255,12 +252,12 @@ static int cmd_df(int argc, char **argv) units_set_mode(&unit_mode, UNITS_BINARY); break; default: @@ -252,13 +252,13 @@ index 43d5c31dcbb0..6626c7c9eaa2 100644 } } - if (check_argc_max(argc, optind + 1)) + if (check_argc_exact(argc, optind + 1)) - usage(cmd_df_usage); + usage(cmd_filesystem_df_usage); path = argv[optind]; -@@ -273,7 +270,6 @@ static int cmd_df(int argc, char **argv) +@@ -281,7 +278,6 @@ static int cmd_df(int argc, char **argv) close_file_or_dir(fd, dirstream); return !!ret; } @@ -266,7 +266,7 @@ index 43d5c31dcbb0..6626c7c9eaa2 100644 static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label, char *search) -@@ -1275,8 +1271,8 @@ const struct cmd_group filesystem_cmd_group = { +@@ -1287,8 +1283,8 @@ const struct cmd_group filesystem_cmd_gr { "balance", cmd_balance, NULL, &balance_cmd_group, 1 }, { "resize", cmd_resize, cmd_resize_usage, NULL, 0 }, { "label", cmd_label, cmd_label_usage, NULL, 0 }, @@ -277,6 +277,3 @@ index 43d5c31dcbb0..6626c7c9eaa2 100644 NULL_CMD_STRUCT } --- -2.1.1 - diff --git a/0042-btrfs-progs-fix-linking-with-libbtrfs.patch b/0042-btrfs-progs-fix-linking-with-libbtrfs.patch deleted file mode 100644 index 18f6c7b..0000000 --- a/0042-btrfs-progs-fix-linking-with-libbtrfs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b64e66feed24dd9fc008e96f0d5371b0bd0eb019 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Thu, 30 Oct 2014 18:33:41 +0100 -Subject: [PATCH 42/42] btrfs-progs: fix linking with libbtrfs - -Reported at https://github.com/openSUSE/snapper/issues/128 - -Commit cdb9e22e292275237c added another rbtree file that defines -functions that libbtrfs uses. - -Signed-off-by: David Sterba ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7f76447e3c55..7368502b5416 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,14 +10,14 @@ objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \ - root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \ - extent-cache.o extent_io.o volumes.o utils.o repair.o \ - qgroup.o raid6.o free-space-cache.o list_sort.o props.o \ -- ulist.o qgroup-verify.o backref.o rbtree-utils.o string-table.o -+ ulist.o qgroup-verify.o backref.o string-table.o - cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ - cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \ - cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \ - cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \ - cmds-property.o cmds-fi-disk_usage.o - libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \ -- uuid-tree.o utils-lib.o -+ uuid-tree.o utils-lib.o rbtree-utils.o - libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \ - crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \ - extent_io.h ioctl.h ctree.h btrfsck.h version.h --- -2.1.1 - diff --git a/0043-btrfs-progs-libbtrfs-make-exported-headers-compatibl.patch b/0043-btrfs-progs-libbtrfs-make-exported-headers-compatibl.patch deleted file mode 100644 index 5039730..0000000 --- a/0043-btrfs-progs-libbtrfs-make-exported-headers-compatibl.patch +++ /dev/null @@ -1,99 +0,0 @@ -From cafacda441120976105d01c07286e843cb7cbb94 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Mon, 3 Nov 2014 23:50:50 +0100 -Subject: [PATCH] btrfs-progs: libbtrfs, make exported headers compatible with - C++ - -Add externs and don't use a reserved keyword. - -Signed-off-by: David Sterba ---- - rbtree-utils.h | 8 ++++++++ - rbtree.h | 10 +++++++++- - rbtree_augmented.h | 8 ++++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/rbtree-utils.h b/rbtree-utils.h -index 7298c72eba3d..718581ff105c 100644 ---- a/rbtree-utils.h -+++ b/rbtree-utils.h -@@ -21,6 +21,10 @@ - - #include "rbtree.h" - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - /* The common insert/search/free functions */ - typedef int (*rb_compare_nodes)(struct rb_node *node1, struct rb_node *node2); - typedef int (*rb_compare_keys)(struct rb_node *node, void *key); -@@ -42,4 +46,8 @@ static void free_##name##_tree(struct rb_root *root) \ - rb_free_nodes(root, free_func); \ - } - -+#ifdef __cplusplus -+} -+#endif -+ - #endif -diff --git a/rbtree.h b/rbtree.h -index 03c06d8ec16a..0d4f2bfd5a5e 100644 ---- a/rbtree.h -+++ b/rbtree.h -@@ -34,6 +34,10 @@ - #include - #endif /* BTRFS_FLAT_INCLUDES */ - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - struct rb_node { - unsigned long __rb_parent_color; - struct rb_node *rb_right; -@@ -75,7 +79,7 @@ extern struct rb_node *rb_first_postorder(const struct rb_root *); - extern struct rb_node *rb_next_postorder(const struct rb_node *); - - /* Fast replacement of a single node without remove/rebalance/add/rebalance */ --extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, -+extern void rb_replace_node(struct rb_node *victim, struct rb_node *new_node, - struct rb_root *root); - - static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, -@@ -107,4 +111,8 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, - typeof(*pos), field); 1; }); \ - pos = n) - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* _LINUX_RBTREE_H */ -diff --git a/rbtree_augmented.h b/rbtree_augmented.h -index 079eb978dc4d..cbc963981667 100644 ---- a/rbtree_augmented.h -+++ b/rbtree_augmented.h -@@ -26,6 +26,10 @@ - - #include "rbtree.h" - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - /* - * Please note - only struct rb_augment_callbacks and the prototypes for - * rb_insert_augmented() and rb_erase_augmented() are intended to be public. -@@ -228,4 +232,8 @@ rb_erase_augmented(struct rb_node *node, struct rb_root *root, - __rb_erase_color(rebalance, root, augment->rotate); - } - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* _LINUX_RBTREE_AUGMENTED_H */ --- -2.1.1 - diff --git a/btrfs-progs-v3.17.2.tar.gz b/btrfs-progs-v3.17.2.tar.gz new file mode 100644 index 0000000..25aa879 --- /dev/null +++ b/btrfs-progs-v3.17.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bb12f09c13f57f2e7f7c85fcaf0677aaf076b09fed06f2d34373720f0b6e980 +size 792538 diff --git a/btrfs-progs-v3.17.tar.gz b/btrfs-progs-v3.17.tar.gz deleted file mode 100644 index f8c90c2..0000000 --- a/btrfs-progs-v3.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cf3ed9ae5b0a03762f648fe71a2ddd4b1a7740480eeaeb8e8d9b57d6a7b1608 -size 477477 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 6bebcc0..4c866fd 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Wed Nov 19 00:00:01 CET 2014 - dsterba@suse.cz + +- version 3.17.2 + - check improvements + - add ability to replace missing dir item/dir indexes + - fix missing inode items + - create missing root dirid + - corrupt block: enhancements for testing fsck + - zero-log: able to reset a fs with bogus log tree pointer (bko#72151) + +------------------------------------------------------------------- +Wed Nov 19 00:00:00 CET 2014 - dsterba@suse.cz + +- package mkinitrd scripts conditionally (bsc#893577) +- spec: minor updates + +------------------------------------------------------------------- +Fri Nov 7 00:00:00 CET 2014 - dsterba@suse.cz + +- version 3.17.1 + - fi df: argument handling + - fix linking with libbtrfs + - replace: better error reporting + - fi show: fixed stall if run concurrently with balance + - check: fixed argument parsing for --subvol-extents + - fi df: SI prefixes corrected +- Added patches: + * fix-doc-build-on-SLE11SP3.diff +- Removed patches: + * 0042-btrfs-progs-fix-linking-with-libbtrfs.patch + * 0043-btrfs-progs-libbtrfs-make-exported-headers-compatibl.patch +- Modified patches: + * 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch + * 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch + * 0019-btrfs-progs-add-original-df-and-rename-disk_usage-to.patch + ------------------------------------------------------------------- Mon Nov 3 00:00:00 CET 2014 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 1c11d2c..5fe3c0f 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -16,9 +16,8 @@ # -%define tar_version v3.17 Name: btrfsprogs -Version: 3.17 +Version: 3.17.2 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 @@ -26,7 +25,8 @@ Group: System/Filesystems Url: http://btrfs.wiki.kernel.org/index.php/Main_Page #Git-Web: http://git.kernel.org/cgit/linux/kernel/git/kdave/btrfs-progs.git #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs -Source: https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-%{tar_version}.tar.gz +Source: https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v%{version}.tar.gz +# support for mkinitrd in < 13.1 Source1: boot-btrfs.sh Source4: setup-btrfs.sh @@ -50,8 +50,6 @@ Patch28: 0028-btrfs-progs-rework-calculations-of-fi-usage.patch Patch29: 0029-btrfs-progs-replace-df_pretty_sizes-with-pretty_size.patch Patch30: 0030-btrfs-progs-clean-up-return-codes-and-paths.patch Patch31: 0031-btrfs-progs-move-global-reserve-to-overall-summary.patch -Patch42: 0042-btrfs-progs-fix-linking-with-libbtrfs.patch -Patch43: 0043-btrfs-progs-libbtrfs-make-exported-headers-compatibl.patch Patch163: 0163-btrfs-progs-fsck-fix-segfault.patch Patch167: 0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch @@ -59,6 +57,7 @@ Patch168: 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch Patch169: 0169-btrfs-progs-Check-metadata-mirrors-in-find-root.patch Patch1000: local-version-override.patch +Patch1001: fix-doc-build-on-SLE11SP3.diff BuildRequires: asciidoc BuildRequires: libacl-devel @@ -67,6 +66,9 @@ BuildRequires: libblkid-devel BuildRequires: libext2fs-devel BuildRequires: libuuid-devel BuildRequires: lzo-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: suse-module-tools +%endif BuildRequires: udev BuildRequires: xmlto BuildRequires: zlib-devel @@ -95,7 +97,7 @@ This package contains the libraries and headers files for developers to build applications to interface with btrfs. %prep -%setup -q -n btrfs-progs-%{tar_version} +%setup -q -n btrfs-progs-v%{version} %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -116,13 +118,12 @@ build applications to interface with btrfs. %patch30 -p1 %patch31 -p1 %patch28 -p1 -%patch42 -p1 -%patch43 -p1 %patch163 -p1 %patch167 -p1 %patch168 -p1 %patch169 -p1 %patch1000 -p1 +%patch1001 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" all btrfs-convert \ @@ -153,9 +154,11 @@ ln -s %{_sbindir}/btrfs-debug-tree %{buildroot}/sbin ln -s %{_sbindir}/btrfs-show-super %{buildroot}/sbin ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin +%if 0%{?suse_version} < 1310 install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/ install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/ install -m 0755 %{SOURCE4} %{buildroot}/lib/mkinitrd/scripts/ +%endif find %{buildroot} -type f -name "*.la" -delete -print # don't install .a for now rm -f %{buildroot}/%{_libdir}/*.a @@ -175,6 +178,11 @@ done %postun -n libbtrfs0 -p /sbin/ldconfig +%if 0%{?suse_version} >= 1310 +%posttrans +%{?regenerate_initrd_posttrans} +%endif + %files %defattr(-, root, root) /sbin/fsck.btrfs @@ -198,10 +206,12 @@ done %{_sbindir}/mkfs.btrfs %{_sbindir}/btrfs-debug-tree %{_sbindir}/btrfs-show-super +%if 0%{?suse_version} < 1310 %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-btrfs.sh /lib/mkinitrd/scripts/setup-btrfs.sh +%endif %{_bindir}/btrfs-map-logical %{_mandir}/man8/btrfs-image.8.gz %{_mandir}/man8/btrfsck.8.gz diff --git a/fix-doc-build-on-SLE11SP3.diff b/fix-doc-build-on-SLE11SP3.diff new file mode 100644 index 0000000..104dafc --- /dev/null +++ b/fix-doc-build-on-SLE11SP3.diff @@ -0,0 +1,20 @@ +Build on SLE11SP3 complains: + +ERROR: btrfs-mount.xml.tmp1: line 9: second section must be named SYNOPSIS + + +Index: btrfs-progs-v3.17.1/Documentation/btrfs-mount.txt +=================================================================== +--- btrfs-progs-v3.17.1.orig/Documentation/btrfs-mount.txt ++++ btrfs-progs-v3.17.1/Documentation/btrfs-mount.txt +@@ -5,6 +5,10 @@ NAME + ---- + btrfs-mount - mount options and supported file attributes for the btrfs filesystem + ++SYNOPSIS ++-------- ++*man btrfs* ++ + DESCRIPTION + ----------- + This document describes mount options specific to the btrfs filesystem. diff --git a/local-version-override.patch b/local-version-override.patch index bc8816a..1b899c5 100644 --- a/local-version-override.patch +++ b/local-version-override.patch @@ -6,8 +6,8 @@ Index: btrfs-progs-v3.16.1/version.sh # Copyright 2008, Oracle # Released under the GNU GPLv2 --v="v3.17" -+v="v3.17+20141103" +-v="v3.17.2" ++v="v3.17.2+20141119" lib_major=0 lib_minor=1