From 4ba358158e21dd85d129bbe93585ad0e056bcf86 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jan 22 2024 21:29:17 +0000 Subject: Update to 6.7 and drop upstreamed patches --- diff --git a/0001-btrfs-progs-mkfs-Enforce-4k-sectorsize-by-default.patch b/0001-btrfs-progs-mkfs-Enforce-4k-sectorsize-by-default.patch deleted file mode 100644 index 11a218c..0000000 --- a/0001-btrfs-progs-mkfs-Enforce-4k-sectorsize-by-default.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 4d8199f0e3d30be69ebd10820d5402ec8d326e38 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Wed, 22 Mar 2023 18:17:14 -0400 -Subject: [PATCH 1/1] btrfs-progs: mkfs: Enforce 4k sectorsize by default - -We have had working subpage support in Btrfs for many cycles now. -Generally, we do not want people creating filesystems by default -with non-4k sectorsizes since it creates portability problems. - -Signed-off-by: Neal Gompa - -Reviewed-by: Anand Jain -Reviewed-by: Qu Wenruo -Reviewed-by: Josef Bacik ---- - Documentation/Subpage.rst | 17 +++++++++-------- - Documentation/mkfs.btrfs.rst | 13 +++++++++---- - mkfs/main.c | 2 +- - 3 files changed, 19 insertions(+), 13 deletions(-) - -diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst -index c762b6a3..4bcfc6cf 100644 ---- a/Documentation/Subpage.rst -+++ b/Documentation/Subpage.rst -@@ -9,18 +9,19 @@ to the exactly same size of the block and page. On x86_64 this is typically - pages, like 64KiB on 64bit ARM or PowerPC. This means filesystems created - with 64KiB sector size cannot be mounted on a system with 4KiB page size. - --While with subpage support systems with 64KiB page size can create --and mount filesystems with 4KiB sectorsize. This still needs to use option "-s --4k" option for :command:`mkfs.btrfs`. -+Since v6.5, filesystems are created with a 4KiB sectorsize by default, -+though it remains possible to create filesystems with other page sizes -+(such as 64KiB with the "-s 64k" option for :command:`mkfs.btrfs`). This -+ensures that new filesystems are compatible across other architecture -+variants using larger page sizes. - - Requirements, limitations - ------------------------- - --The initial subpage support has been added in v5.15, although it's still --considered as experimental, most features are already working without problems. --On a 64KiB page system filesystem with 4KiB sectorsize can be mounted and used --as usual as long as the initial mount succeeds. There are cases a mount will be --rejected when verifying compatible features. -+The initial subpage support has been added in v5.15. Most features are -+already working without problems. On a 64KiB page system, a filesystem with -+4KiB sectorsize can be mounted and used as long as the initial mount succeeds. -+Subpage support is used by default for systems with a non-4KiB page size since v6.5. - - Please refer to status page of :ref:`status-subpage-block-size` for - compatibility. -diff --git a/Documentation/mkfs.btrfs.rst b/Documentation/mkfs.btrfs.rst -index 1fca7448..d602fe9c 100644 ---- a/Documentation/mkfs.btrfs.rst -+++ b/Documentation/mkfs.btrfs.rst -@@ -122,10 +122,15 @@ OPTIONS - -s|--sectorsize - Specify the sectorsize, the minimum data block allocation unit. - -- The default value is the page size and is autodetected. If the sectorsize -- differs from the page size, the created filesystem may not be mountable by the -- running kernel. Therefore it is not recommended to use this option unless you -- are going to mount it on a system with the appropriate page size. -+ By default, the value is 4KiB, but it can be manually set to match the -+ system page size. However, if the sector size is different from the page -+ size, the resulting filesystem may not be mountable by the current -+ kernel, apart from the default 4KiB. Hence, using this option is not -+ advised unless you intend to mount it on a system with the suitable -+ page size. -+ -+ .. note:: -+ Versions prior to 6.4 set the sectorsize matching to the page size. - - -L|--label - Specify a label for the filesystem. The *string* should be less than 256 -diff --git a/mkfs/main.c b/mkfs/main.c -index 1c5d668e..bd2e4350 100644 ---- a/mkfs/main.c -+++ b/mkfs/main.c -@@ -1204,7 +1204,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) - } - - if (!sectorsize) -- sectorsize = (u32)sysconf(_SC_PAGESIZE); -+ sectorsize = (u32)SZ_4K; - if (btrfs_check_sectorsize(sectorsize)) - goto error; - --- -2.41.0 - diff --git a/0002-btrfs-progs-mkfs-doc-Drop-version-change-for-4k-sect.patch b/0002-btrfs-progs-mkfs-doc-Drop-version-change-for-4k-sect.patch deleted file mode 100644 index 42f9855..0000000 --- a/0002-btrfs-progs-mkfs-doc-Drop-version-change-for-4k-sect.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 692f223b5a152951d38d2dcf9103d28b2185626c Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Tue, 21 Mar 2023 15:40:15 -0400 -Subject: [PATCH 2/2] btrfs-progs: mkfs: doc: Drop version change for 4k - sectorsize - -This is not yet upstream so we don't know what version this change -has landed in. ---- - Documentation/Subpage.rst | 4 ++-- - Documentation/mkfs.btrfs.rst | 3 --- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst -index 4bcfc6cf..698085bd 100644 ---- a/Documentation/Subpage.rst -+++ b/Documentation/Subpage.rst -@@ -9,7 +9,7 @@ to the exactly same size of the block and page. On x86_64 this is typically - pages, like 64KiB on 64bit ARM or PowerPC. This means filesystems created - with 64KiB sector size cannot be mounted on a system with 4KiB page size. - --Since v6.5, filesystems are created with a 4KiB sectorsize by default, -+Filesystems are created with a 4KiB sectorsize by default, - though it remains possible to create filesystems with other page sizes - (such as 64KiB with the "-s 64k" option for :command:`mkfs.btrfs`). This - ensures that new filesystems are compatible across other architecture -@@ -21,7 +21,7 @@ Requirements, limitations - The initial subpage support has been added in v5.15. Most features are - already working without problems. On a 64KiB page system, a filesystem with - 4KiB sectorsize can be mounted and used as long as the initial mount succeeds. --Subpage support is used by default for systems with a non-4KiB page size since v6.5. -+Subpage support is used by default for systems with a non-4KiB page size. - - Please refer to status page of :ref:`status-subpage-block-size` for - compatibility. -diff --git a/Documentation/mkfs.btrfs.rst b/Documentation/mkfs.btrfs.rst -index d602fe9c..11ac4af2 100644 ---- a/Documentation/mkfs.btrfs.rst -+++ b/Documentation/mkfs.btrfs.rst -@@ -129,9 +129,6 @@ OPTIONS - advised unless you intend to mount it on a system with the suitable - page size. - -- .. note:: -- Versions prior to 6.4 set the sectorsize matching to the page size. -- - -L|--label - Specify a label for the filesystem. The *string* should be less than 256 - bytes and must not contain newline characters. --- -2.41.0 - diff --git a/btrfs-progs.spec b/btrfs-progs.spec index 22827fb..67ba5b6 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -2,7 +2,7 @@ %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}} Name: btrfs-progs -Version: 6.6.2 +Version: 6.7 Release: 1.1%{?dist} Summary: Userspace programs for btrfs @@ -15,10 +15,7 @@ Source2: gpgkey-F2B41200C54EFB30380C1756C565D5F9D76D583B.gpg # Patches backported from upstream (0-400) # Patches proposed upstream (500-900) -## From: https://lore.kernel.org/linux-btrfs/20230322221714.2702819-1-neal@gompa.dev/T/#t -Patch0501: 0001-btrfs-progs-mkfs-Enforce-4k-sectorsize-by-default.patch -## Fedora specific doc change stacked on top -Patch0502: 0002-btrfs-progs-mkfs-doc-Drop-version-change-for-4k-sect.patch + # Patches not for upstream (1000-1400) ## Disable RAID56 modes Patch1001: 1001-balance-mkfs-Disable-raid56-modes.patch @@ -35,6 +32,7 @@ BuildRequires: pkgconfig(libgcrypt) >= 1.8.0 BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libzstd) >= 1.0.0 BuildRequires: python3-sphinx +BuildRequires: python3dist(sphinx-rtd-theme) BuildRequires: systemd BuildRequires: python3-devel >= 3.4 BuildRequires: python3-setuptools @@ -158,11 +156,20 @@ popd %{python3_sitearch}/btrfsutil-*.egg-info/ %changelog +* Mon Jan 22 2024 Neal Gompa - 6.7-1.1 +- Adapt for CentOS Hyperscale + +* Mon Jan 22 2024 Neal Gompa - 6.7-1 +- Update to 6.7 + * Sat Jan 20 2024 Neal Gompa - 6.6.2-1.1 - Build for CentOS Hyperscale - Refresh patch for disabling raid56 mode - Drop Facebook patch set +* Fri Jan 19 2024 Fedora Release Engineering - 6.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Nov 24 2023 Neal Gompa - 6.6.2-1 - Update to 6.6.2 diff --git a/sources b/sources index 3da7c4d..c4ac240 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (btrfs-progs-v6.6.2.tar.sign) = a140aae1bc0a0f240518062180270d30369a96d66e8a006e7f55cc51cde430f5c36886a0557af8a28bc843077d4971e4c30a561a01cc34d93e4275d813d6290e -SHA512 (btrfs-progs-v6.6.2.tar.xz) = 23878cdd6f16a7ddba55321169bf7dd565719dd5d16a5a47fb7879aa0e04bd9008dc436cdbb712cee286b3a9b97ac3a4f6ea22213286a5025b5371d7975a2fa8 +SHA512 (btrfs-progs-v6.7.tar.sign) = 13638ebc79b05a91ed1588e999c37fbdf8bde9bc8ab9c8821720ff6d1b98334af354ee5de7ca13897c94dbcf036d09c122768ea7350e86829ddfb03be45761c3 +SHA512 (btrfs-progs-v6.7.tar.xz) = 2f60fad3b8e12d549cc032935e35d73228034506f0a6687c0b678e12d791d658605f9918f59c0e9d4a4d43c6a7b26713d1d31f0b6bafc9e77c4acfd8cc9bbb68 SHA512 (gpgkey-F2B41200C54EFB30380C1756C565D5F9D76D583B.gpg) = ff67511f7bca01f67a52210152e0d0c11e6a4d36281e8f484a7c908c9fed97a8541f22858902c4ae325135216a226a2d4104befedc679f307a5a36747539ddef