From 4c6470d870286c3256ada5565a23e45d556030d82b8a0dcd9e3282951bda72c7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 5 Nov 2016 20:23:30 +0000 Subject: [PATCH] Accepting request 437996 from filesystems - update to 4.8.2 (forwarded request 437995 from dsterba) OBS-URL: https://build.opensuse.org/request/show/437996 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=80 --- btrfs-progs-v4.7.3.tar.gz | 3 --- btrfs-progs-v4.8.2.tar.gz | 3 +++ btrfsprogs.changes | 38 ++++++++++++++++++++++++++++++++++++ btrfsprogs.spec | 10 +++++++++- local-version-override.patch | 4 ++-- mkfs-default-features.patch | 30 ++++++++++++++++++++++++++++ sles11-defaults.h | 5 +++++ 7 files changed, 87 insertions(+), 6 deletions(-) delete mode 100644 btrfs-progs-v4.7.3.tar.gz create mode 100644 btrfs-progs-v4.8.2.tar.gz create mode 100644 mkfs-default-features.patch create mode 100644 sles11-defaults.h diff --git a/btrfs-progs-v4.7.3.tar.gz b/btrfs-progs-v4.7.3.tar.gz deleted file mode 100644 index cedc607..0000000 --- a/btrfs-progs-v4.7.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c16df42626193345fa51301aaa2180e910d00fd2daed31e0f036589f900394e5 -size 1623377 diff --git a/btrfs-progs-v4.8.2.tar.gz b/btrfs-progs-v4.8.2.tar.gz new file mode 100644 index 0000000..a5ab39f --- /dev/null +++ b/btrfs-progs-v4.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfe1b692d23bb2121df85206ed9f0ab71b2b6baa2ce7393b943aad856a387dc4 +size 1675808 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index ca9795e..392474a 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Mon Oct 31 00:00:00 CET 2016 - dsterba@suse.cz + +- update to 4.8.2 + * convert: also convert file attributes + * convert: fix wrong tree block alignment for unalianged block group + * check: quota verify fixes, handle reloc tree + * build: add stub for FIEMAP_EXTENT_SHARED, compiles on ancient kernels + * build: add stub for BUILD_ASSERT when ioctl.h is included + * dump-tree: don't crash on unrecognized tree id for -t + * tests: + * add more ioctl tests + * convert: more symlink tests, attribute tests + * quota verify for reloc tree + * other cleanups + +------------------------------------------------------------------- +Tue Oct 25 15:58:46 UTC 2016 - jeffm@suse.com + +- Add ability to provide site specific defaults for mkfs (FATE#320615). + * Only used for SLES11 defaults. +- Added patch mkfs-default-features.patch + +------------------------------------------------------------------- +Tue Oct 18 00:00:00 CEST 2016 - dsterba@suse.cz + +- update to 4.8.1 + * 32bit builds fixed + * build without backtrace support fixed +- update to 4.8 + * error handling improvements all over the place + * new fuzzed images, test updates + * doc fixups + * minor cleanups and improvements + * kernel library helpers moved to own directory + * qgroup: fix regression leading to incorrect status after check, + introduced in 4.7 + ------------------------------------------------------------------- Wed Sep 28 00:00:00 CEST 2016 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 5f072a9..8af6ded 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -28,7 +28,7 @@ %endif Name: btrfsprogs -Version: 4.7.3 +Version: 4.8.2 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0 @@ -40,12 +40,14 @@ Source: https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs # support for mkinitrd in < 13.1 Source1: boot-btrfs.sh Source4: setup-btrfs.sh +Source5: sles11-defaults.h Patch163: 0163-btrfs-progs-fsck-fix-segfault.patch Patch167: 0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch Patch168: 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch Patch1000: local-version-override.patch +Patch1001: mkfs-default-features.patch BuildRequires: asciidoc BuildRequires: autoconf @@ -141,9 +143,15 @@ thing. %patch167 -p1 %patch168 -p1 %patch1000 -p1 +%patch1001 -p1 %build ./autogen.sh +%if 0%{?suse_version} == 1110 +cp %{SOURCE5} . +export CFLAGS="%optflags -include sles11-defaults.h" +%endif + %configure make V=1 %{?_smp_mflags} all \ %if %build_static diff --git a/local-version-override.patch b/local-version-override.patch index a388bcf..971d825 100644 --- a/local-version-override.patch +++ b/local-version-override.patch @@ -6,8 +6,8 @@ Index: btrfs-progs-v4.1/version.sh # Copyright 2008, Oracle # Released under the GNU GPLv2 --v="v4.7.3" -+v="v4.7.3+20160926" +-v="v4.8.2" ++v="v4.8.2+20161031" opt=$1 diff --git a/mkfs-default-features.patch b/mkfs-default-features.patch new file mode 100644 index 0000000..12c2af1 --- /dev/null +++ b/mkfs-default-features.patch @@ -0,0 +1,30 @@ +From: Jeff Mahoney +Subject: mkfs: allow site to override defaults +Patch-mainline: Never, a real solution with a config file is required +References: FATE#320615 + +This is a simple method to allow us to set site defaults for mkfs by +adding -include to cflags. + +Signed-off-by: Jeff Mahoney +--- + utils.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/utils.h ++++ b/utils.h +@@ -28,10 +28,14 @@ + + #define BTRFS_MKFS_SYSTEM_GROUP_SIZE (4 * 1024 * 1024) + #define BTRFS_MKFS_SMALL_VOLUME_SIZE (1024 * 1024 * 1024) ++#ifndef BTRFS_MKFS_DEFAULT_NODE_SIZE + #define BTRFS_MKFS_DEFAULT_NODE_SIZE 16384 ++#endif ++#ifndef BTRFS_MKFS_DEFAULT_FEATURES + #define BTRFS_MKFS_DEFAULT_FEATURES \ + (BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF \ + | BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA) ++#endif + + /* + * Avoid multi-device features (RAID56) and mixed block groups diff --git a/sles11-defaults.h b/sles11-defaults.h new file mode 100644 index 0000000..d6cedac --- /dev/null +++ b/sles11-defaults.h @@ -0,0 +1,5 @@ +#ifndef _SLES11_DEFAULTS_H +#define _SLES11_DEFAULTS_H +#define BTRFS_MKFS_DEFAULT_NODE_SIZE sysconf(_SC_PAGESIZE) +#define BTRFS_MKFS_DEFAULT_FEATURES BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF +#endif