From 23593fd541e252cc80e7dd1bddf31c2b00f6753d82f6179589b81faee954f6e4 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 8 Jan 2018 15:07:50 +0000 Subject: [PATCH] Accepting request 562560 from home:dsterba:branches:filesystems - update to version 4.14.1 OBS-URL: https://build.opensuse.org/request/show/562560 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=283 --- btrfs-progs-v4.13.3.tar.gz | 3 --- btrfs-progs-v4.14.1.tar.gz | 3 +++ btrfsprogs.changes | 29 +++++++++++++++++++++++++++++ btrfsprogs.spec | 18 ++++++++++++------ rollback-regression-fix.patch | 35 ----------------------------------- 5 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 btrfs-progs-v4.13.3.tar.gz create mode 100644 btrfs-progs-v4.14.1.tar.gz delete mode 100644 rollback-regression-fix.patch diff --git a/btrfs-progs-v4.13.3.tar.gz b/btrfs-progs-v4.13.3.tar.gz deleted file mode 100644 index bc659d8..0000000 --- a/btrfs-progs-v4.13.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c12582bca7c7c42142795521b7c26f3e781c14722921b8601186672bc9d2afc1 -size 2040383 diff --git a/btrfs-progs-v4.14.1.tar.gz b/btrfs-progs-v4.14.1.tar.gz new file mode 100644 index 0000000..f8f5705 --- /dev/null +++ b/btrfs-progs-v4.14.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01c8e894f5b86bb580caa382aa04f4bab9cfcc3b671fb87c4547edd6f7cf724c +size 2298441 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index d849ddb..8a4c17d 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Jan 8 00:00:00 CET 2018 - dsterba@suse.cz + +- update to version 4.14.1 + * dump-tree: print times of root items + * check: fix several lowmem mode bugs + * convert: fix rollback after balance + * other + * new and updated tests, enabled lowmem mode in CI + * docs updates + * fix travis CI build + * build fixes + * cleanups +- update to version 4.14 + * build: libzstd now required by default + * check: more lowmem mode repair enhancements + * subvol set-default: also accept path + * prop set: compression accepts no/none, same as "" + * filesystem usage: enable for filesystem on top of a seed device + * rescue: new command fix-device-size + * other + * new tests + * cleanups and refactoring + * doc updates +- Removed patches: + - rollback-regression-fix.patch - upstreamed +- spec: disable static build, missing libzstd-devel-static +- spec: disable zstd support for non-Tumbleweed distros + ------------------------------------------------------------------- Tue Dec 19 11:31:07 UTC 2017 - wqu@suse.de diff --git a/btrfsprogs.spec b/btrfsprogs.spec index a08a660..b897eda 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package btrfsprogs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,12 @@ %if 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1315 %define build_static 0 %else -%define build_static 1 +# temporarily disable until libzstd-devel-static +%define build_static 0 %endif Name: btrfsprogs -Version: 4.13.3 +Version: 4.14.1 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 @@ -43,7 +44,6 @@ Source4: setup-btrfs.sh Source5: sles11-defaults.h Patch1: mkfs-default-features.patch -Patch2: rollback-regression-fix.patch BuildRequires: asciidoc BuildRequires: autoconf @@ -54,6 +54,9 @@ BuildRequires: libext2fs-devel BuildRequires: libreiserfscore-devel >= 3.6.27 Requires: libreiserfscore0 >= 3.6.27 BuildRequires: libuuid-devel +%if 0%{?suse_version} > 1500 +BuildRequires: libzstd-devel +%endif BuildRequires: lzo-devel BuildRequires: pkg-config %if 0%{?suse_version} >= 1310 @@ -138,7 +141,6 @@ thing. %prep %setup -q -n btrfs-progs-v%{version} %patch1 -p1 -%patch2 -p1 %build ./autogen.sh @@ -147,7 +149,11 @@ cp %{SOURCE5} . export CFLAGS="%optflags -include sles11-defaults.h" %endif -%configure +%configure \ +%if 0%{?suse_version} < 1500 + --disable-zstd +%endif + make V=1 %{?_smp_mflags} all \ %if %build_static static diff --git a/rollback-regression-fix.patch b/rollback-regression-fix.patch deleted file mode 100644 index e1ab7ad..0000000 --- a/rollback-regression-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Qu Wenruo -Subject: [PATCH] btrfs-progs: convert: Fix a bug in rollback check which overwrite return value -Path-mainline: Will land in v4.14.1. - -Commit 1170ac307900 ("btrfs-progs: convert: Introduce function to check if -convert image is able to be rolled back") reworked rollback check -condition, by checking 1:1 mapping of each file extent. - -The idea itself has nothing wrong, but error handler is not implemented -correctly, which over writes the return value and always try to rollback -the fs even it fails to pass the check. - -Fix it by correctly return the error before rollback the fs. - -Fixes: 1170ac307900 ("btrfs-progs: convert: Introduce function to check if convert image is able to be rolled back") -Reported-by: Jeff Mahoney -Signed-off-by: Qu Wenruo -Signed-off-by: David Sterba ---- - convert/main.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: btrfs-progs-v4.13.3/convert/main.c -=================================================================== ---- btrfs-progs-v4.13.3.orig/convert/main.c -+++ btrfs-progs-v4.13.3/convert/main.c -@@ -1443,6 +1443,8 @@ next: - } - } - btrfs_release_path(&path); -+ if (ret) -+ return ret; - /* - * For HOLES mode (without NO_HOLES), we must ensure file extents - * cover the whole range of the image