From 635e0d31b786cefdaa823e8ae2742e58c362126369f3a1d7f88799d2385d7f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 8 Jun 2024 17:38:43 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main btrfsprogs revision 1a4e7823b15ad4fab0564b84d06c58a4 --- btrfs-progs-v6.1.3.tar.gz | 3 - btrfs-progs-v6.1.3.tar.sign | Bin 566 -> 0 bytes btrfs-progs-v6.8.1.tar.gz | 3 + btrfs-progs-v6.8.1.tar.sign | Bin 0 -> 566 bytes btrfsprogs.changes | 327 ++++++++++++++++++++++++++++++++++++ btrfsprogs.spec | 22 +-- mkfs-default-features.patch | 8 +- 7 files changed, 345 insertions(+), 18 deletions(-) delete mode 100644 btrfs-progs-v6.1.3.tar.gz delete mode 100644 btrfs-progs-v6.1.3.tar.sign create mode 100644 btrfs-progs-v6.8.1.tar.gz create mode 100644 btrfs-progs-v6.8.1.tar.sign diff --git a/btrfs-progs-v6.1.3.tar.gz b/btrfs-progs-v6.1.3.tar.gz deleted file mode 100644 index 065a826..0000000 --- a/btrfs-progs-v6.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:747d6367cbf88d2a997befe72f49c66339ebfb28ca60880f4f5b4e0ec779bcce -size 2882830 diff --git a/btrfs-progs-v6.1.3.tar.sign b/btrfs-progs-v6.1.3.tar.sign deleted file mode 100644 index 175fec08abc2e5e365cfd8f3b6f6fd5b38bef49c0407113e5d2db571dbc3d2b3..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%Os4e*g*z5XEKH z`PXe&J6EC*0FTs`cT>+tTk_=*fs+B>COj7_kUtf-ri?Z0(A>V5oWNva7%Qrh#4XGB z{$`rOVn7|UcdpH%=1T%l_;mWLW6n$w2wE4VK!Mupmj9GovU94>2!IN~u1OMM=}(DB zBn8j}udnl~d@p6gj;GT(K6q4lb|JkWfliY)eLU3zUa_+a}>_oIVFCaZ@*>&|az z1Ig1t(k;7yo~uljX8-QS#y>m_`)c7Su5P(nRrU`M#mnHyRy~*3e%_@Z7Nd+*Md7u} zL8M5LDhifEJPzV^-oKok4`XYoR*?T_10&xwEd670R>J_&qN;fC zK3QHIu8ODb^7aJvyKfL9aoy=jN}ZB?!O=}nAoC68;glsP7otAES@;{vHzlUEGHc<> zJJ$#}H;eo=zOQ@R6omc?-)j zRp_RCvf>u)H>eDOw#oCb2AevwOwMKsduGJ;l!dmJknrt*0~wUAAtwc8KBd}E?|2mx zDM;z^zdD^ED65uE+~Rb8>4LXi-Qj|5XUm3_kEJ+h%n`~T*qT%u8?$xQ$ZbAKOzY`whTAd>Q|#W!3rDZCE=60%kLSa{vkn5XEKH z`PXe&JE2hz{0!3{Igh0nhLGbvsK%$0Yc@-a-brK->Kb*hnmT^jB|~SSa{Es}%*mJG z#{>y%+N1(z(Lmeb|1|n~dMAZ80`nR1P>8Gn$*s9;X~StSA1is}-}}?P2Zz6Z$ohpz zlcYJwuW$86#2fK4N(+Y6^OQhK<0f>OI%WHTaEuEQ5mxaI_oDztp|)+nSDQi=lqf#l zG#`a!lNl{t`ow{IfI^688}(%s*L3H2@`dgjU+F5NCZ*&>EfZBHtX!_2q98f1a#<60 zjd)U1tr<^9me^XrYTh;G{YzrYX8K?CAIcH1(P&-y2vp<0DEUpDHlA=+A_V3gn}=;c z@n8&Ez_UK&P15(5m_KipoMto=4y6zvkoX*BZsZ{$m8=5Rr?Drd)Ds-pmw=y*z E&Z;^MxBvhE literal 0 HcmV?d00001 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index fd1038a..4482ceb 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,330 @@ +------------------------------------------------------------------- +Thu May 2 00:00:00 CEST 2024 - dsterba@suse.cz + +- update to 6.8.1 + * mkfs: fix writing on zoned device when block-group-tree is selected + * tune: fix writing on zoned device with option --convert-to-block-group-tree + * check: + * more progress and error messages + * unify handling of unknown command line options with other commands + * subvolume delete: remove options --delete-qgroup and --no-delete-qgroup + (added in 6.6.3), qgroup deletion does not always work due to delayed + background processing of subvolume or set value in + sysfs:ggroup/drop_subtree_threshold + * other: + * misc refactoring + * error handling fixes reported by gcc -fanalyzer + * documentation updates + * new and updated tests + +------------------------------------------------------------------- +Tue Mar 26 23:39:29 UTC 2024 - David Disseldorp + +- enable zstd support for 15.6 / SLE15-SP6 build targets (bsc#1221943) + +------------------------------------------------------------------- +Tue Mar 26 00:00:00 CET 2024 - dsterba@suse.cz + +- update to 6.8 + * fix --enqueue option timeout handling + * subvolume: remove support for undocumented options -c and -x, + functionality disabled in kernel + * libbtrfsutil: + * version 0.1.3, backward compabile + * add aliases for all existing functions with unified naming scheme + * updated header defintions for recently added kernel features + * send: v3 supported in experimental mode + * other: + * docs: manual page references, graphs, enhancements, clarifications + * error handling fixes + * cleanups and refactoring + +------------------------------------------------------------------- +Thu Feb 15 00:00:00 CET 2024 - dsterba@suse.cz + +- update to 6.7.1 + * convert: raid-stripe-tree can be now enabled for the target filesystem + * mkfs: + * handle lifetime of open file descriptors so it does not trigger udev + that could miss to create the UUID symlinks in /dev + * update warning when CPU page size does not match sector size + * merge features in summary, no more distinction of incompat and runtime + to match the semantics of option -O + * fi show: fix recognizing raw device mapper paths + * other: + * documentation updates, fix links to labels in included directories + +------------------------------------------------------------------- +Thu Jan 25 00:00:00 CET 2024 - dsterba@suse.cz + +- update to 6.7 + * mkfs: make 4k sectorsize default, recommended minimum kernel for that is + 6.1 and requires subpage support on architectures with page size > 4k + * subvolume create: return correct error code when a target already exists + * tree-checker: dump tree block on error (btrfs-convert, ...) + * scrub limit: fix reporting of a limit set while there's none + * fi usage: fix reporting of unallocated data or raid56 profile without root + privs due to lack of that information + * convert: + * align data block group lengths to 64K + * fix conversion of a large filesystem when there are partial inode items + present due to caching + * other: + * build fixes + * updated documentation + * new and updated tests +- update to 6.6.3 + * subvol create: accept multiple arguments + * subvol delete: print the subvolume id in the output + * subvol sync: check if the filesystems is still writeable so it does not + wait indefinitely + * device delete: add a timeout and warning when deleting multiple devices + * scrub status: report limit if set in sysfs/../scrub_speed_max + * scrub limit: new command to show or set the per-device scrub limits + * scrub start: report the limit if set + * build: + * fix CPU feature detection on aarch64 + * support Botan and OpenSSL (3.2+) as crypto backends + * other: + * documentation updates, RTD config update + * new and updated tests + * CI updates + +------------------------------------------------------------------- +Wed Nov 15 00:00:00 CET 2023 - dsterba@suse.cz + +- update to 6.6.2 + * squota: change key number of EXTENT_OWNER_REF_KEY, sync with kernel 6.7-rc1 + * property set/get: completely skip char devices, trying to set properties + and open /dev/watchdog* causes a reboot + * other: build warnings, test updates, documentation updates +- update to 6.6.1 + * fix device scanning ioctl definition, accidental change to the 'forget' ioctl + that breaks mounting multi-device filesystems +- update to 6.6 + * new global option --dry-run, now implemented for 'subvolume delete' + * fi defrag: new option --step to defragment files in steps, report progress + * balance: removed support for obsolete short syntax 'btrfs balance /path' + * mkfs: print zone count for each device in the overview + * check: + * verify inline ref ordering + * deprecate --clear-space-cache, moved to the 'rescue' group + * rescue clear-space-cache: new command moved from 'btrfs check' implementing + the same as option --clear-space-cache (to be deprecated and removed in the + future) + * dump-tree: output sequence number for inline refs + * fixes: + * fi resize: fallback to lowest devid when 1 does not exist, previously the + command would fail with "No such device" + * fi usage: fix "devices 0 != 1" message and broken output on multi-device + filesystem + * open files in non-blocking mode when reading fsid, this could hang when + trying to open fifo files or some special character devices, was observed + with 'prop set/get' + * experimental: + * mkfs: parametric zone size for emulated zoned mode + * other: + * cleanups refactoring + * new and updated tests + * CI updates + * documentation updates + +------------------------------------------------------------------- +Mon Oct 23 00:00:00 CEST 2023 - dsterba@suse.cz + +- update to 6.5.3 + * mkfs: + * add short aliases for -O specification, block-group-tree (bgt), + free-space-tree (fst), raid-stripe-tree (rst) + * don't try to resize the image (namely when backed by file) when --rootdir + contains sparse file larger than the image + * also copy xattr/permissions/ugid/timestamps of the top --rootdir directory + * add new option --device-uuid to let user specify exact uuid of the + device item (only for single device filesystems) + * check: + * on zoned devices, use correct super block offsets when repairing + * check inline extent refs order + * subvolume create: add new option --parent to create missing path + components of the given path (like mkdir -p) + * rescue clear-ino-cache: new command moved from 'btrfs check' implementing + the same as option --clear-ino-cache (to be deprecated and removed in the + future) + * dump-tree: allow '-' in tree identifier names for option -t + * btrfstune: + * drop short option and add long option to enable squota + * tune space reservation and batch size for block-group-tree conversion + * scrub status: print correct value of "Bytes scrubbed" for unfinished runs + * qgroup show: fix crash when attempting to print path of stale qgroups + * experimental features: + * move build of raid-stripe-tree out for testing but it's still considered + experimental + * other: + * shell completion updates + * sync raid-stripe-tree code with kernel + * build fixes + * new and updated tests +- update to 6.5.2 + * new feature support: + * raid-stripe-tree, new tree to track extent mapping for raid profiles, + allows raid1*, raid0 and raid10 on zoned devices (kernel 6.7) + * simple quotas, simplified accounting that does not track exclusive and + shared extents (kernel 6.7) + * mkfs with duplicate UUID on a single device, temp-fsid (kernel 6.7) + * metadata_uuid: enhanced capabilities to repair partially updated fsid on + multiple devices + * other: + * updated tests and CI + * sync sources with kernel + +------------------------------------------------------------------- +Wed Sep 13 00:00:00 CEST 2023 - dsterba@suse.cz + +- update to 6.5.1: + * build fixes: + * crc32c if PIE or relro is enabled + * detect if PCLMUL feature is recognized by compiler and also detect that + at runtime + * check: verify metadata item level when skinny-metadata is enabled + * other: minor build and docs updates + * spec: remove xmlto dependency, docs built by sphinx + +------------------------------------------------------------------- +Fri Sep 1 00:00:00 CEST 2023 - dsterba@suse.cz + +- update to 6.5: + * crc32c implementation speedup (3x) + * btrfstune: + * be more strict about option combinations and refuse changing + features from incompatible groups + * metadata_uuid changes fixes + * libbtrfs: fix ABI breakage introduced in 6.3.1, revert struct subvol_info + and subvol_uuid_search changes (bsc#1212217) + * CI updates + * pull request build tests enabled + * published static binaries built with backward compatibility (-march=x86-64) + * other + * documentation updates + * new and updated tests + * experimental feature updates (json, list-chunks, checksum switch) + * code refactoring + * remove btrfs-fragments + +------------------------------------------------------------------- +Mon Aug 28 00:00:00 CEST 2023 - dsterba@suse.cz + +- update to 6.3.3: + * add btrfs-find-root to btrfs.box + * replace: properly enqueue if there's another replace running + * other: + * CI updates, more tests enabled, code coverage, badges + * documentation updates + * build warning fixes + +------------------------------------------------------------------- +Thu Jul 6 13:45:20 UTC 2023 - Dominik Heidler + +- Let btrfsprogs-bash-completion conflict with btrfsprogs <= 6.2.1 + as there is a file conflict with the bash completion scripts + still being bundled with btrfsprogs in these versions. + +------------------------------------------------------------------- +Tue Jun 20 07:12:59 UTC 2023 - Paolo Stivanin + +- update to 6.3.2: + * fix mkfs and others on big endian hosts + * mkfs: don't print changed defaults notice with --quiet + * scrub: fix wrong stats of processed bytes in background and foreground mode + * convert: actually create free-space-tree instead of v1 space cache + * print-tree: recognize and print CHANGING_FSID_V2 flag (for the + metadata_uuid change in progress) + * other: documentation updates +- update to 6.3.1: + * convert: fix checksum of a block relocated from 0-1M range + * qgroup show: fix formatting of limit values in json output + * receive: report paret subovl UUID on errors + * btrfsune: new option --convert-to-free-space-tree to convert from + block-group-tree back to extent tree for block group tracking + * mkfs: make option --rootdir more verbose and report start when filling + from the given directory starts + * experimental: + * btrfstune: checksum switch logic reimplemented, conversion of all + metadata and data now works, resume from various states also supported + * other: + * test updates and fixes + * CI cleanups and old files removed + * integration with Github actions +- Remove patch: btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch (upstreamed) + +------------------------------------------------------------------- +Mon May 29 00:00:00 CEST 2023 - dsterba@suse.cz + +- qgroup show: fix formatting of limit values in json output (bsc#1206960, + bsc#1209136) +- Added patch: btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch + +------------------------------------------------------------------- +Mon May 22 00:00:00 CEST 2023 - dsterba@suse.cz + +- update to 6.3 + * mkfs: option -R deprecated, options unified in -O (-R still works) + * mkfs: fix potential race with udev leading to EBUSY due to repeatedly + opened file descriptors + * block-group-tree is out of experimental mode + * available as 'mkfs.btrfs -O block-group-tree' + * btrfstune can do in-place conversion to/from (use with care) + * balance: fix recognizing old and new syntax + * subvol snapshot: specific error if a failure is caused by an active swapfile + * tree-stats: rephrase warning when run on a mounted filesystem + * completion: 'filesystem du' also completes files + * check: fix docs, help text and warning that --force + --repair works on a + mounted filesystem + * build: fix static build when static libudev is available + * documentation: + * more updates from wiki, developer docs, changelogs + * reformatting + * updates and fixes + * other: + * test updates and fixes + * CI cleanups and old files removed + * integration with Github actions + +------------------------------------------------------------------- +Tue Apr 11 00:00:00 CEST 2023 - dsterba@suse.cz + +- Use pre-generated documentation from tarball, fixes build on SLE targets + where sphinx might not be available + +------------------------------------------------------------------- +Tue Apr 11 00:00:00 CEST 2023 - dsterba@suse.cz + +- update to 6.2.2 + * fix build on old x86 architectures with builtin crypto + * device stats: fix printing wrong values in tabular output + * qgroup show: fix qgroup id formatting in json output + * restore: fix restoring xattrs on directories + * restore: don't modify metadata in dry-run mode + * balance: fix some cases wrongly parsed as old syntax + * balance: warn when deprecated syntax is used + * seeding: fall back to old way if sysfs device fsid is not available + * convert: handle orphan file ext4 feature + * other: + * sync ioctl definitions + * enable github CI + * update documentation +- update to 6.2.1 + * fix build with crypto libraries + * CI images updated, build tests extended +- update to 6.2: + * receive: fix a corruption when decompressing zstd extents + * subvol sync: print total number and deletion progress + * accelerated hash algorithm implementations in fallback mode on x86_64 + * fi mkswapfile: new option --uuid + * new global option --log=level to set the verbosity level directly + * other: + * experimental: update checksum conversion (not usable yet) + * build actually requires -std=gnu11 + * refactor help option formatting, auto wrap long lines + ------------------------------------------------------------------- Wed Mar 8 19:03:04 UTC 2023 - Callum Farmer diff --git a/btrfsprogs.spec b/btrfsprogs.spec index bce1ef9..dde9701 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package btrfsprogs # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,12 +29,12 @@ %endif # the tarball contains prebuilt documentation -%define build_docs 1 +%define build_docs 0 %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut) Name: btrfsprogs -Version: 6.1.3 +Version: 6.8.1 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0-only @@ -70,7 +70,7 @@ BuildRequires: libreiserfscore-devel >= 3.6.27 Requires: libreiserfscore0 >= 3.6.27 %endif BuildRequires: libuuid-devel -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150600 BuildRequires: libzstd-devel %endif BuildRequires: lzo-devel @@ -79,12 +79,9 @@ BuildRequires: pkg-config BuildRequires: suse-module-tools %endif BuildRequires: libudev-devel -BuildRequires: pkgconfig(udev) -%if %build_docs -BuildRequires: xmlto -%endif BuildRequires: python-rpm-macros BuildRequires: zlib-devel +BuildRequires: pkgconfig(udev) %if 0%{?suse_version} >= 1310 Requires(post): coreutils Requires(postun):coreutils @@ -110,7 +107,7 @@ BuildRequires: libblkid-devel-static BuildRequires: libcom_err-devel-static BuildRequires: libext2fs-devel-static BuildRequires: libuuid-devel-static -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150600 BuildRequires: libzstd-devel-static %endif BuildRequires: lzo-devel-static @@ -197,6 +194,8 @@ Summary: Bash completion for btrfsprogs Group: System/Shells Requires: %{name} Requires: bash-completion +# versions below 6.2.1 had bash completion files builtin and will create a file conflict +Conflicts: %{name} <= 6.2.1 %if 0%{?suse_version} >= 1500 Supplements: (%{name} and bash-completion) %else @@ -207,8 +206,7 @@ Supplements: packageand(%{name}:bash-completion) bash command line completion support for btrfsprogs. %prep -%setup -q -n btrfs-progs-v%{version} -%patch1 -p1 +%autosetup -p1 -n btrfs-progs-v%{version} %build ./autogen.sh @@ -220,8 +218,10 @@ bash command line completion support for btrfsprogs. %endif %if 0%{?suse_version} <= 1500 --disable-zoned \ +%if 0%{?sle_version} < 150600 --disable-zstd %endif +%endif make V=1 %{?_smp_mflags} all \ %if %{build_static} diff --git a/mkfs-default-features.patch b/mkfs-default-features.patch index 0543de6..df293cd 100644 --- a/mkfs-default-features.patch +++ b/mkfs-default-features.patch @@ -11,10 +11,10 @@ Signed-off-by: Jeff Mahoney utils.h | 4 ++++ 1 file changed, 4 insertions(+) -Index: btrfs-progs-v6.0/common/fsfeatures.h +Index: btrfs-progs-v6.5.3/common/fsfeatures.h =================================================================== ---- btrfs-progs-v6.0.orig/common/fsfeatures.h -+++ btrfs-progs-v6.0/common/fsfeatures.h +--- btrfs-progs-v6.5.3.orig/common/fsfeatures.h ++++ btrfs-progs-v6.5.3/common/fsfeatures.h @@ -21,7 +21,9 @@ #include #include "kernel-lib/sizes.h" @@ -26,7 +26,7 @@ Index: btrfs-progs-v6.0/common/fsfeatures.h /* * Since one feature can set at least one bit in either @@ -44,11 +46,20 @@ struct btrfs_mkfs_features { - #define BTRFS_FEATURE_STRING_BUF_SIZE (160) + #define BTRFS_FEATURE_STRING_BUF_SIZE (512) static const struct btrfs_mkfs_features btrfs_mkfs_default_features = { +#ifndef BTRFS_MKFS_DEFAULT_RUNTIME_FEATURES