Accepting request 562612 from filesystems
OBS-URL: https://build.opensuse.org/request/show/562612 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=91
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
1d96a8a8c3
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c12582bca7c7c42142795521b7c26f3e781c14722921b8601186672bc9d2afc1
|
||||
size 2040383
|
||||
3
btrfs-progs-v4.14.1.tar.gz
Normal file
3
btrfs-progs-v4.14.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01c8e894f5b86bb580caa382aa04f4bab9cfcc3b671fb87c4547edd6f7cf724c
|
||||
size 2298441
|
||||
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 8 00:00:01 CET 2018 - dsterba@suse.cz
|
||||
|
||||
- spec: fix distro version condition
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From: Qu Wenruo <wqu@suse.com>
|
||||
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 <jeffm@suse.com>
|
||||
Signed-off-by: Qu Wenruo <wqu@suse.com>
|
||||
Signed-off-by: David Sterba <dsterba@suse.com>
|
||||
---
|
||||
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
|
||||
Loading…
Reference in New Issue
Block a user