Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2014-09-08 21:28:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2014-07-13 14:06:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2014-09-08 21:28:19.000000000 +0200 @@ -1,0 +2,55 @@ +Fri Sep 5 15:02:39 CEST 2014 - dste...@suse.cz + +- send-stream API users updatd, drop the workaround +- Removed patch: send-stream-api-wokaround.patch + +------------------------------------------------------------------- +Mon Sep 1 14:07:53 CEST 2014 - dste...@suse.cz + +- workaround for send api breakage +- Added patch: send-stream-api-wokaround.patch + +------------------------------------------------------------------- +Wed Aug 27 17:23:48 CEST 2014 - dste...@suse.cz + +- add api versioning and package version.h (now 0.1.1) +- Added patches: + * library-version-defines.patch + +------------------------------------------------------------------- +Tue Aug 26 20:13:21 CEST 2014 - dste...@suse.cz + +- version 3.16 + - show-super: skip unrecognized sb, add option to force + - debug-tree: print tree by id + - mkfs: new option to specify UUID + - receive: new option to limit number of errors + - check: new option to verify quotas + - check: reduced memory requirements + - check: new option to print extent sharing + - restore: check length before decompression + - restore: more error handling + - balance: new filter 'limit' + - recover: allow to read all sb copies + - restore: option to loop during restoring + - mkfs: drop experimental notice + - btrfstune: new option to force dangerous changes + - documentation updates + +- Deleted patches (upstream): + * 0001-btrfs-progs-doc-fix-symlink-target-for-btrfsck.8.patch + * 0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch + * 0201-btrfs-progs-import-ulist.patch + * 0202-btrfs-progs-add-quota-group-verify-code.patch + * 0203-btrfs-progs-show-extent-state-for-a-subvolume.patch + * 0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch + * btrfs-progs-canonicalize-pathnames-for-device-commands +- Refreshed patches: + * 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch + * 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch + * 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch + * 0013-btrfs-progs-Add-command-btrfs-filesystem-disk-usage.patch + * 0028-btrfs-progs-extend-pretty-printers-with-unit-mode.patch + * 0164-btrfs-progs-convert-set-label-or-copy-from-origin.patch + +------------------------------------------------------------------- Old: ---- 0001-btrfs-progs-doc-fix-symlink-target-for-btrfsck.8.patch 0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch 0201-btrfs-progs-import-ulist.patch 0202-btrfs-progs-add-quota-group-verify-code.patch 0203-btrfs-progs-show-extent-state-for-a-subvolume.patch 0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch btrfs-progs-canonicalize-pathnames-for-device-commands btrfs-progs-v3.14.2.tar.bz2 New: ---- btrfs-progs-v3.16.tar.gz library-version-defines.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -16,9 +16,9 @@ # -%define tar_version v3.14.2 +%define tar_version v3.16 Name: btrfsprogs -Version: 3.14.2 +Version: 3.16 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 @@ -26,12 +26,10 @@ Url: http://btrfs.wiki.kernel.org/index.php/Main_Page #Git-Web: http://git.kernel.org/cgit/linux/kernel/git/mason/btrfs-progs.git #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs -# git archive --format=tar --prefix=btrfs-progs-`git describe --tags --match "v*"`/ HEAD > %D/btrfs-progs-`git describe --tags --match "v*"`.tar -Source: btrfs-progs-%{tar_version}.tar.bz2 +Source: https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/btrfs-progs-%{tar_version}.tar.gz Source1: boot-btrfs.sh Source4: setup-btrfs.sh -Patch1: 0001-btrfs-progs-doc-fix-symlink-target-for-btrfsck.8.patch Patch6: 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch Patch7: 0007-Btrfs-progs-fsck-avoid-pinning-same-block-several-ti.patch Patch8: 0008-Btrfs-progs-fsck-add-ability-to-check-reloc-roots.patch @@ -63,15 +61,10 @@ 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 Patch171: 0171-btrfs-progs-make-free-space-checker-work-on-non-4k-s.patch -Patch172: btrfs-progs-canonicalize-pathnames-for-device-commands - -Patch200: 0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch -Patch201: 0201-btrfs-progs-import-ulist.patch -Patch202: 0202-btrfs-progs-add-quota-group-verify-code.patch -Patch203: 0203-btrfs-progs-show-extent-state-for-a-subvolume.patch -Patch204: 0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch Patch1000: local-version-override.patch +Patch1001: library-version-defines.patch + BuildRequires: asciidoc BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -108,7 +101,6 @@ %prep %setup -q -n btrfs-progs-%{tar_version} -%patch1 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -139,13 +131,8 @@ %patch168 -p1 %patch169 -p1 %patch171 -p1 -%patch172 -p1 -%patch200 -p1 -%patch201 -p1 -%patch202 -p1 -%patch203 -p1 -%patch204 -p1 %patch1000 -p1 +%patch1001 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" all btrfs-convert \ @@ -157,13 +144,12 @@ install -m 0755 -d %{buildroot}/%{_bindir} # move some utilities out of /usr/sbin mv %{buildroot}/%{_sbindir}/btrfs-map-logical %{buildroot}/%{_bindir} -# mkinitrd rescue utilities +# initrd rescue utilities install -m 0755 btrfs-zero-log %{buildroot}/%{_sbindir} install -m 0755 btrfs-select-super %{buildroot}/%{_sbindir} install -m 0755 btrfs-image %{buildroot}/%{_sbindir} install -m 0755 btrfstune %{buildroot}/%{_sbindir} install -m 0755 btrfs-find-root %{buildroot}/%{_sbindir} -#UsrMerge install -m 0755 -d %{buildroot}/sbin ln -s %{_sbindir}/btrfs %{buildroot}/sbin ln -s %{_sbindir}/btrfs-zero-log %{buildroot}/sbin @@ -177,9 +163,6 @@ ln -s %{_sbindir}/btrfs-show-super %{buildroot}/sbin ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin -#EndUsrMerge -#UsrMerge -#EndUsrMerge install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/ install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/ install -m 0755 %{SOURCE4} %{buildroot}/lib/mkinitrd/scripts/ @@ -206,7 +189,6 @@ %defattr(-, root, root) /sbin/fsck.btrfs # mkinitrd utils -#UsrMerge /sbin/btrfs /sbin/btrfs-zero-log /sbin/btrfs-convert @@ -216,7 +198,6 @@ /sbin/mkfs.btrfs /sbin/btrfs-debug-tree /sbin/btrfs-show-super -#EndUsrMerge %{_sbindir}/btrfs %{_sbindir}/btrfs-zero-log %{_sbindir}/btrfs-convert @@ -231,13 +212,13 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-btrfs.sh /lib/mkinitrd/scripts/setup-btrfs.sh -# other %{_bindir}/btrfs-map-logical %{_mandir}/man8/btrfs-image.8.gz %{_mandir}/man8/btrfsck.8.gz %{_mandir}/man8/fsck.btrfs.8.gz %{_mandir}/man8/mkfs.btrfs.8.gz %{_mandir}/man8/btrfs.8.gz +%{_mandir}/man5/btrfs.5.gz %{_mandir}/man8/btrfs-convert.8.gz %{_mandir}/man8/btrfs-debug-tree.8.gz %{_mandir}/man8/btrfs-map-logical.8.gz ++++++ 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -15,11 +15,11 @@ cmds-check.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) -diff --git a/cmds-check.c b/cmds-check.c -index 1fe97b3a38c0..7457618fb702 100644 ---- a/cmds-check.c -+++ b/cmds-check.c -@@ -6616,6 +6616,22 @@ out: +Index: btrfs-progs-v3.16/cmds-check.c +=================================================================== +--- btrfs-progs-v3.16.orig/cmds-check.c ++++ btrfs-progs-v3.16/cmds-check.c +@@ -6538,6 +6538,22 @@ out: return ret; } @@ -42,7 +42,7 @@ static struct option long_options[] = { { "super", 1, NULL, 's' }, { "repair", 0, NULL, 0 }, -@@ -6720,6 +6736,23 @@ int cmd_check(int argc, char **argv) +@@ -6657,6 +6673,23 @@ int cmd_check(int argc, char **argv) } root = info->fs_root; @@ -64,8 +64,5 @@ + } + uuid_unparse(info->super_copy->fsid, uuidbuf); - printf("Checking filesystem on %s\nUUID: %s\n", argv[optind], uuidbuf); - --- -1.9.0 - + if (qgroup_report) { + printf("Print quota groups for %s\nUUID: %s\n", argv[optind], ++++++ 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -21,11 +21,11 @@ create mode 100644 cmds-fi-disk_usage.c create mode 100644 cmds-fi-disk_usage.h -diff --git a/Makefile b/Makefile -index 76565e8b2307..50fb9b0ff2e3 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.16/Makefile +=================================================================== +--- btrfs-progs-v3.16.orig/Makefile ++++ btrfs-progs-v3.16/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 \ @@ -34,11 +34,10 @@ libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \ uuid-tree.o utils-lib.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..4012c781f20d +Index: btrfs-progs-v3.16/cmds-fi-disk_usage.c +=================================================================== --- /dev/null -+++ b/cmds-fi-disk_usage.c ++++ btrfs-progs-v3.16/cmds-fi-disk_usage.c @@ -0,0 +1,516 @@ +/* + * This program is free software; you can redistribute it and/or @@ -556,11 +555,10 @@ + 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.16/cmds-fi-disk_usage.h +=================================================================== --- /dev/null -+++ b/cmds-fi-disk_usage.h ++++ btrfs-progs-v3.16/cmds-fi-disk_usage.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2007 Oracle. All rights reserved. @@ -587,10 +585,10 @@ +int cmd_filesystem_df(int argc, char **argv); + +#endif -diff --git a/cmds-filesystem.c b/cmds-filesystem.c -index 306f715475ac..0edfb50daca2 100644 ---- a/cmds-filesystem.c -+++ b/cmds-filesystem.c +Index: btrfs-progs-v3.16/cmds-filesystem.c +=================================================================== +--- btrfs-progs-v3.16.orig/cmds-filesystem.c ++++ btrfs-progs-v3.16/cmds-filesystem.c @@ -36,6 +36,7 @@ #include "volumes.h" #include "version.h" @@ -599,7 +597,7 @@ #include "list_sort.h" #include "disk-io.h" -@@ -112,50 +113,6 @@ static const char * const filesystem_cmd_group_usage[] = { +@@ -112,50 +113,6 @@ static const char * const filesystem_cmd NULL }; @@ -650,7 +648,7 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) { u64 count = 0; -@@ -204,51 +161,6 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret) +@@ -204,51 +161,6 @@ static int get_df(int fd, struct btrfs_i return 0; } @@ -688,7 +686,7 @@ - } - ret = get_df(fd, &sargs); - -- if (!ret && sargs) { +- if (ret == 0) { - print_df(sargs); - free(sargs); - } else { @@ -702,7 +700,7 @@ static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label, char *search) { -@@ -999,7 +911,7 @@ static int cmd_label(int argc, char **argv) +@@ -999,7 +911,7 @@ static int cmd_label(int argc, char **ar const struct cmd_group filesystem_cmd_group = { filesystem_cmd_group_usage, NULL, { @@ -711,11 +709,11 @@ { "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 a4d2cd114614..8ac17619b9dc 100644 ---- a/ctree.h -+++ b/ctree.h -@@ -843,9 +843,10 @@ struct btrfs_csum_item { +Index: btrfs-progs-v3.16/ctree.h +=================================================================== +--- btrfs-progs-v3.16.orig/ctree.h ++++ btrfs-progs-v3.16/ctree.h +@@ -845,9 +845,10 @@ struct btrfs_csum_item { #define BTRFS_BLOCK_GROUP_RAID1 (1ULL << 4) #define BTRFS_BLOCK_GROUP_DUP (1ULL << 5) #define BTRFS_BLOCK_GROUP_RAID10 (1ULL << 6) @@ -728,10 +726,10 @@ #define BTRFS_BLOCK_GROUP_TYPE_MASK (BTRFS_BLOCK_GROUP_DATA | \ BTRFS_BLOCK_GROUP_SYSTEM | \ -diff --git a/utils.c b/utils.c -index e130849c7bb5..7731b071f353 100644 ---- a/utils.c -+++ b/utils.c +Index: btrfs-progs-v3.16/utils.c +=================================================================== +--- btrfs-progs-v3.16.orig/utils.c ++++ btrfs-progs-v3.16/utils.c @@ -38,6 +38,8 @@ #include <linux/kdev_t.h> #include <limits.h> @@ -741,9 +739,9 @@ #include "kerncompat.h" #include "radix-tree.h" #include "ctree.h" -@@ -2206,3 +2208,13 @@ int find_mount_root(const char *path, char **mount_root) - free(longest_match); - return ret; +@@ -2436,3 +2438,13 @@ int test_isdir(const char *path) + + return S_ISDIR(st.st_mode); } + +u64 disk_size(char *path) @@ -755,17 +753,15 @@ + else + return sfs.f_bsize * sfs.f_blocks; +} -diff --git a/utils.h b/utils.h -index db8d63c396d5..581faa9f6972 100644 ---- a/utils.h -+++ b/utils.h -@@ -101,5 +101,6 @@ int get_btrfs_mount(const char *dev, char *mp, size_t mp_size); - int find_mount_root(const char *path, char **mount_root); - int get_device_info(int fd, u64 devid, - struct btrfs_ioctl_dev_info_args *di_args); +Index: btrfs-progs-v3.16/utils.h +=================================================================== +--- btrfs-progs-v3.16.orig/utils.h ++++ btrfs-progs-v3.16/utils.h +@@ -118,6 +118,7 @@ int test_uuid_unique(char *fs_uuid); + int test_minimum_size(const char *file, u32 leafsize); + int test_issubvolname(const char *name); + int test_isdir(const char *path); +u64 disk_size(char *path); - #endif --- -1.9.0 - + /* + * Btrfs minimum size calculation is complicated, it should include at least: ++++++ 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -39,24 +39,23 @@ create mode 100644 string_table.c create mode 100644 string_table.h -diff --git a/Makefile b/Makefile -index 50fb9b0ff2e3..bf6dc1c67d2c 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.16/Makefile +=================================================================== +--- btrfs-progs-v3.16.orig/Makefile ++++ btrfs-progs-v3.16/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 \ -- utils-lib.o -+ utils-lib.o string_table.o +- ulist.o qgroup-verify.o ++ ulist.o qgroup-verify.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..016356c50392 +Index: btrfs-progs-v3.16/string_table.c +=================================================================== --- /dev/null -+++ b/string_table.c ++++ btrfs-progs-v3.16/string_table.c @@ -0,0 +1,156 @@ +/* + * This program is free software; you can redistribute it and/or @@ -214,11 +213,10 @@ + free(tab); + +} -diff --git a/string_table.h b/string_table.h -new file mode 100644 -index 000000000000..83c4425d5f76 +Index: btrfs-progs-v3.16/string_table.h +=================================================================== --- /dev/null -+++ b/string_table.h ++++ btrfs-progs-v3.16/string_table.h @@ -0,0 +1,36 @@ +/* + * This program is free software; you can redistribute it and/or @@ -256,6 +254,3 @@ +void table_free(struct string_table *); + +#endif --- -1.9.0 - ++++++ 0013-btrfs-progs-Add-command-btrfs-filesystem-disk-usage.patch ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -13,10 +13,10 @@ utils.h | 5 + 5 files changed, 499 insertions(+) -diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c -index 4012c781f20d..16b3ab250956 100644 ---- a/cmds-fi-disk_usage.c -+++ b/cmds-fi-disk_usage.c +Index: btrfs-progs-v3.16/cmds-fi-disk_usage.c +=================================================================== +--- btrfs-progs-v3.16.orig/cmds-fi-disk_usage.c ++++ btrfs-progs-v3.16/cmds-fi-disk_usage.c @@ -20,10 +20,12 @@ #include <unistd.h> #include <sys/ioctl.h> @@ -44,7 +44,7 @@ /* * Pretty print the size * PAY ATTENTION: it return a statically buffer -@@ -514,3 +523,422 @@ int cmd_filesystem_df(int argc, char **argv) +@@ -514,3 +523,422 @@ int cmd_filesystem_df(int argc, char **a return 0; } @@ -467,10 +467,10 @@ + + return 0; +} -diff --git a/cmds-fi-disk_usage.h b/cmds-fi-disk_usage.h -index 9f68bb342d52..c7459b1521e4 100644 ---- a/cmds-fi-disk_usage.h -+++ b/cmds-fi-disk_usage.h +Index: btrfs-progs-v3.16/cmds-fi-disk_usage.h +=================================================================== +--- btrfs-progs-v3.16.orig/cmds-fi-disk_usage.h ++++ btrfs-progs-v3.16/cmds-fi-disk_usage.h @@ -22,4 +22,7 @@ extern const char * const cmd_filesystem_df_usage[]; int cmd_filesystem_df(int argc, char **argv); @@ -479,11 +479,11 @@ +int cmd_filesystem_disk_usage(int argc, char **argv); + #endif -diff --git a/cmds-filesystem.c b/cmds-filesystem.c -index 0edfb50daca2..214a0cda518c 100644 ---- a/cmds-filesystem.c -+++ b/cmds-filesystem.c -@@ -918,6 +918,9 @@ const struct cmd_group filesystem_cmd_group = { +Index: btrfs-progs-v3.16/cmds-filesystem.c +=================================================================== +--- btrfs-progs-v3.16.orig/cmds-filesystem.c ++++ btrfs-progs-v3.16/cmds-filesystem.c +@@ -918,6 +918,9 @@ 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 }, @@ -493,11 +493,11 @@ NULL_CMD_STRUCT } }; -diff --git a/utils.c b/utils.c -index 7731b071f353..f2ab416c28b2 100644 ---- a/utils.c -+++ b/utils.c -@@ -2218,3 +2218,63 @@ u64 disk_size(char *path) +Index: btrfs-progs-v3.16/utils.c +=================================================================== +--- btrfs-progs-v3.16.orig/utils.c ++++ btrfs-progs-v3.16/utils.c +@@ -2448,3 +2448,63 @@ u64 disk_size(char *path) else return sfs.f_bsize * sfs.f_blocks; } @@ -561,13 +561,13 @@ + return "unknown"; + } +} -diff --git a/utils.h b/utils.h -index 581faa9f6972..2d08e0b2a3a4 100644 ---- a/utils.h -+++ b/utils.h -@@ -102,5 +102,10 @@ int find_mount_root(const char *path, char **mount_root); - int get_device_info(int fd, u64 devid, - struct btrfs_ioctl_dev_info_args *di_args); +Index: btrfs-progs-v3.16/utils.h +=================================================================== +--- btrfs-progs-v3.16.orig/utils.h ++++ btrfs-progs-v3.16/utils.h +@@ -119,6 +119,11 @@ int test_minimum_size(const char *file, + int test_issubvolname(const char *name); + int test_isdir(const char *path); u64 disk_size(char *path); +int get_device_info(int fd, u64 devid, + struct btrfs_ioctl_dev_info_args *di_args); @@ -575,7 +575,5 @@ +const char* group_type_str(u64 flags); +const char* group_profile_str(u64 flags); - #endif --- -1.9.0 - + /* + * Btrfs minimum size calculation is complicated, it should include at least: ++++++ 0028-btrfs-progs-extend-pretty-printers-with-unit-mode.patch ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -14,10 +14,10 @@ utils.h | 21 +++++++++++----- 3 files changed, 66 insertions(+), 35 deletions(-) -diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c -index 9d1c4085b4ea..1e412c0b0e69 100644 ---- a/cmds-fi-disk_usage.c -+++ b/cmds-fi-disk_usage.c +Index: btrfs-progs-v3.16/cmds-fi-disk_usage.c +=================================================================== +--- btrfs-progs-v3.16.orig/cmds-fi-disk_usage.c ++++ btrfs-progs-v3.16/cmds-fi-disk_usage.c @@ -33,18 +33,13 @@ /* @@ -39,11 +39,11 @@ } /* -diff --git a/utils.c b/utils.c -index 159abf8bd0e4..69112be51cb2 100644 ---- a/utils.c -+++ b/utils.c -@@ -1252,35 +1252,62 @@ out: +Index: btrfs-progs-v3.16/utils.c +=================================================================== +--- btrfs-progs-v3.16.orig/utils.c ++++ btrfs-progs-v3.16/utils.c +@@ -1378,35 +1378,62 @@ out: return ret; } @@ -62,10 +62,23 @@ + int base = 0; + const char const **suffix = NULL; + u64 last_size; ++ ++ if (str_size == 0) ++ return 0; - if (str_bytes == 0) -+ if (str_size == 0) ++ if (unit_mode == UNITS_RAW) { ++ snprintf(str, str_size, "%llu", size); return 0; ++ } ++ ++ if (unit_mode == UNITS_BINARY) { ++ base = 1024; ++ suffix = unit_suffix_binary; ++ } else if (unit_mode == UNITS_DECIMAL) { ++ base = 1000; ++ suffix = unit_suffix_decimal; ++ } - if( size < 1024 ){ - fraction = size; @@ -78,33 +91,21 @@ - size /= 1024; - num_divs ++; - } -+ if (unit_mode == UNITS_RAW) { -+ snprintf(str, str_size, "%llu", size); -+ return 0; -+ } - +- - if (num_divs >= ARRAY_SIZE(size_strs)) { - str[0] = '\0'; - return -1; - } - fraction = (float)last_size / 1024; -+ if (unit_mode == UNITS_BINARY) { -+ base = 1024; -+ suffix = unit_suffix_binary; -+ } else if (unit_mode == UNITS_DECIMAL) { -+ base = 1000; -+ suffix = unit_suffix_decimal; - } -- return snprintf(str, str_bytes, "%.2f%s", fraction, -- size_strs[num_divs]); -+ + /* Unknown mode */ + if (!base) { + fprintf(stderr, "INTERNAL ERROR: unknown unit base, mode %d", + unit_mode); + assert(0); + return -1; -+ } + } +- return snprintf(str, str_bytes, "%.2f%s", fraction, +- size_strs[num_divs]); + + num_divs = 0; + last_size = size; @@ -128,13 +129,13 @@ } /* -diff --git a/utils.h b/utils.h -index 2d08e0b2a3a4..3aea8b47d9e7 100644 ---- a/utils.h -+++ b/utils.h -@@ -39,6 +39,14 @@ - - #define BTRFS_UUID_UNPARSED_SIZE 37 +Index: btrfs-progs-v3.16/utils.h +=================================================================== +--- btrfs-progs-v3.16.orig/utils.h ++++ btrfs-progs-v3.16/utils.h +@@ -49,6 +49,14 @@ int check_argc_max(int nargs, int expect + void fixup_argv0(char **argv, const char *token); + void set_argv0(char **argv); +/* + * Output mode of byte units @@ -145,9 +146,9 @@ +#define UNITS_HUMAN UNITS_BINARY + int make_btrfs(int fd, const char *device, const char *label, - u64 blocks[6], u64 num_bytes, u32 nodesize, + char *fs_uuid, u64 blocks[6], u64 num_bytes, u32 nodesize, u32 leafsize, u32 sectorsize, u32 stripesize, u64 features); -@@ -59,12 +67,13 @@ int check_mounted_where(int fd, const char *file, char *where, int size, +@@ -71,12 +79,13 @@ int check_mounted_where(int fd, const ch int btrfs_device_already_in_root(struct btrfs_root *root, int fd, int super_offset); @@ -167,6 +168,3 @@ }) int get_mountpt(char *dev, char *mntpt, size_t size); --- -1.9.0 - ++++++ 0164-btrfs-progs-convert-set-label-or-copy-from-origin.patch ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -8,11 +8,11 @@ btrfs-convert.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) -Index: btrfs-progs-v0.20-rc1-598-g8116550e1662/btrfs-convert.c +Index: btrfs-progs-v3.16/btrfs-convert.c =================================================================== ---- btrfs-progs-v0.20-rc1-598-g8116550e1662.orig/btrfs-convert.c -+++ btrfs-progs-v0.20-rc1-598-g8116550e1662/btrfs-convert.c -@@ -2199,8 +2199,8 @@ err: +--- btrfs-progs-v3.16.orig/btrfs-convert.c ++++ btrfs-progs-v3.16/btrfs-convert.c +@@ -2196,8 +2196,8 @@ err: return ret; } @@ -23,7 +23,7 @@ { int i, ret; int fd = -1; -@@ -2294,6 +2294,17 @@ static int do_convert(const char *devnam +@@ -2291,6 +2291,17 @@ static int do_convert(const char *devnam fprintf(stderr, "error during create_ext2_image %d\n", ret); goto fail; } @@ -41,7 +41,7 @@ printf("cleaning up system chunk.\n"); ret = cleanup_sys_chunk(root, ext2_root); if (ret) { -@@ -2688,11 +2699,13 @@ fail: +@@ -2685,11 +2696,13 @@ fail: static void print_usage(void) { @@ -60,11 +60,12 @@ } int main(int argc, char *argv[]) -@@ -2702,9 +2715,12 @@ int main(int argc, char *argv[]) +@@ -2699,10 +2712,13 @@ int main(int argc, char *argv[]) int noxattr = 0; int datacsum = 1; int rollback = 0; + int copylabel = 0; + int usage_error = 0; char *file; + char *fslabel = NULL; + @@ -74,7 +75,7 @@ if (c < 0) break; switch(c) { -@@ -2720,6 +2736,19 @@ int main(int argc, char *argv[]) +@@ -2718,6 +2734,19 @@ int main(int argc, char *argv[]) case 'r': rollback = 1; break; @@ -94,9 +95,9 @@ default: print_usage(); return 1; -@@ -2740,7 +2769,7 @@ int main(int argc, char *argv[]) +@@ -2755,7 +2784,7 @@ int main(int argc, char *argv[]) if (rollback) { - ret = do_rollback(file, 0); + ret = do_rollback(file); } else { - ret = do_convert(file, datacsum, packing, noxattr); + ret = do_convert(file, datacsum, packing, noxattr, copylabel, fslabel); ++++++ library-version-defines.patch ++++++ >From f412157fd429eab3d309602de214639a8c8c584e Mon Sep 17 00:00:00 2001 From: Arvin Schnell <aschn...@suse.de> Date: Mon, 3 Jun 2013 14:31:41 +0200 Subject: [PATCH] btrfs-progs: library version defines commit 46de1a6ec3dbb0db203baa6c46cb64ba9b000ea2 changed the parameters of btrfs_read_and_process_send_stream(). This breaks snapper compilation. We can include version defines usable for the C preprocessor. Version 0.1.0: API up to and including 46de1a6ec3dbb0db2 (3.14.x) Version 0.1.1: 909131939f750faffb9fab (changed in 3.16) Signed-off-by: Arvin Schnell <aschn...@suse.de> Signed-off-by: David Sterba <dste...@suse.cz> --- Makefile | 2 +- send-stream.h | 5 +++++ version.sh | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e721e99c8319..73ef386896bf 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \ uuid-tree.o utils-lib.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 + extent_io.h ioctl.h ctree.h btrfsck.h version.h TESTS = fsck-tests.sh convert-tests.sh INSTALL = install diff --git a/send-stream.h b/send-stream.h index 293bf6af3659..bedff4d0422c 100644 --- a/send-stream.h +++ b/send-stream.h @@ -18,6 +18,11 @@ #ifndef SEND_STREAM_H_ #define SEND_STREAM_H_ +/* + * NOTE: this file is public API, any incompatible change has to update + * library version + */ + #ifdef __cplusplus extern "C" { #endif diff --git a/version.sh b/version.sh index 90000019fe1d..2e4a8d9e1303 100644 --- a/version.sh +++ b/version.sh @@ -8,6 +8,10 @@ v="v3.16" +lib_major=0 +lib_minor=1 +lib_patchlevel=1 + which git &> /dev/null if [ $? == 0 -a -d .git ]; then if head=`git rev-parse --verify HEAD 2>/dev/null`; then @@ -24,8 +28,19 @@ if [ $? == 0 -a -d .git ]; then fi fi -echo "#ifndef __BUILD_VERSION" > .build-version.h +echo "/* NOTE: this file is autogenerated by version.sh, do not edit */" > .build-version.h +echo "#ifndef __BUILD_VERSION" >> .build-version.h +echo >> .build-version.h echo "#define __BUILD_VERSION" >> .build-version.h +echo >> .build-version.h +echo "#define BTRFS_LIB_MAJOR $lib_major" >> .build-version.h +echo "#define BTRFS_LIB_MINOR $lib_minor" >> .build-version.h +echo "#define BTRFS_LIB_PATCHLEVEL $lib_patchlevel" >> .build-version.h +echo >> .build-version.h +echo "#define BTRFS_LIB_VERSION ( BTRFS_LIB_MAJOR * 10000 + \\" >> .build-version.h +echo " BTRFS_LIB_MINOR * 100 + \\" >> .build-version.h +echo " BTRFS_LIB_PATCHLEVEL )" >> .build-version.h +echo >> .build-version.h echo "#define BTRFS_BUILD_VERSION \"Btrfs $v\"" >> .build-version.h echo "#endif" >> .build-version.h -- 1.9.0 ++++++ local-version-override.patch ++++++ --- /var/tmp/diff_new_pack.4SumGf/_old 2014-09-08 21:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4SumGf/_new 2014-09-08 21:28:20.000000000 +0200 @@ -6,8 +6,8 @@ # Copyright 2008, Oracle # Released under the GNU GPLv2 --v="v3.14.2" -+v="v3.14.2+20140530" +-v="v3.16" ++v="v3.16" which git &> /dev/null if [ $? == 0 -a -d .git ]; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
