From 350542801722a964fe81316c4208eda62b75f01d Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Mon, 29 Dec 2025 19:41:17 -0600 Subject: [PATCH] Btrfs_progs 6.9 => 6.17.1 (#14010) --- manifest/armv7l/b/btrfs_progs.filelist | 8 +++--- manifest/i686/b/btrfs_progs.filelist | 34 -------------------------- manifest/x86_64/b/btrfs_progs.filelist | 8 +++--- packages/btrfs_progs.rb | 13 +++++----- tests/package/b/btrfs_progs | 2 ++ 5 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 manifest/i686/b/btrfs_progs.filelist create mode 100755 tests/package/b/btrfs_progs diff --git a/manifest/armv7l/b/btrfs_progs.filelist b/manifest/armv7l/b/btrfs_progs.filelist index d73f6caa8..89c63975c 100644 --- a/manifest/armv7l/b/btrfs_progs.filelist +++ b/manifest/armv7l/b/btrfs_progs.filelist @@ -1,4 +1,4 @@ -# Total size: 2739650 +# Total size: 6838172 /usr/local/bin/btrfs /usr/local/bin/btrfs-find-root /usr/local/bin/btrfs-image @@ -11,8 +11,6 @@ /usr/local/include/btrfs/ctree.h /usr/local/include/btrfs/ioctl.h /usr/local/include/btrfs/kerncompat.h -/usr/local/include/btrfs/list.h -/usr/local/include/btrfs/rbtree.h /usr/local/include/btrfs/rbtree_types.h /usr/local/include/btrfs/send-stream.h /usr/local/include/btrfs/send-utils.h @@ -23,12 +21,12 @@ /usr/local/lib/libbtrfs.so /usr/local/lib/libbtrfs.so.0 /usr/local/lib/libbtrfs.so.0.1 -/usr/local/lib/libbtrfs.so.0.1.3 +/usr/local/lib/libbtrfs.so.0.1.4 /usr/local/lib/libbtrfsutil.a /usr/local/lib/libbtrfsutil.so /usr/local/lib/libbtrfsutil.so.1 /usr/local/lib/libbtrfsutil.so.1.3 -/usr/local/lib/libbtrfsutil.so.1.3.1 +/usr/local/lib/libbtrfsutil.so.1.3.2 /usr/local/lib/pkgconfig/libbtrfsutil.pc /usr/local/lib/udev/rules.d/64-btrfs-dm.rules /usr/local/lib/udev/rules.d/64-btrfs-zoned.rules diff --git a/manifest/i686/b/btrfs_progs.filelist b/manifest/i686/b/btrfs_progs.filelist deleted file mode 100644 index 128319a87..000000000 --- a/manifest/i686/b/btrfs_progs.filelist +++ /dev/null @@ -1,34 +0,0 @@ -# Total size: 2938888 -/usr/local/bin/btrfs -/usr/local/bin/btrfs-find-root -/usr/local/bin/btrfs-image -/usr/local/bin/btrfs-map-logical -/usr/local/bin/btrfs-select-super -/usr/local/bin/btrfsck -/usr/local/bin/btrfstune -/usr/local/bin/fsck.btrfs -/usr/local/bin/mkfs.btrfs -/usr/local/include/btrfs/ctree.h -/usr/local/include/btrfs/ioctl.h -/usr/local/include/btrfs/kerncompat.h -/usr/local/include/btrfs/list.h -/usr/local/include/btrfs/rbtree.h -/usr/local/include/btrfs/rbtree_types.h -/usr/local/include/btrfs/send-stream.h -/usr/local/include/btrfs/send-utils.h -/usr/local/include/btrfs/send.h -/usr/local/include/btrfs/version.h -/usr/local/include/btrfsutil.h -/usr/local/lib/libbtrfs.a -/usr/local/lib/libbtrfs.so -/usr/local/lib/libbtrfs.so.0 -/usr/local/lib/libbtrfs.so.0.1 -/usr/local/lib/libbtrfs.so.0.1.3 -/usr/local/lib/libbtrfsutil.a -/usr/local/lib/libbtrfsutil.so -/usr/local/lib/libbtrfsutil.so.1 -/usr/local/lib/libbtrfsutil.so.1.3 -/usr/local/lib/libbtrfsutil.so.1.3.1 -/usr/local/lib/pkgconfig/libbtrfsutil.pc -/usr/local/lib/udev/rules.d/64-btrfs-dm.rules -/usr/local/lib/udev/rules.d/64-btrfs-zoned.rules diff --git a/manifest/x86_64/b/btrfs_progs.filelist b/manifest/x86_64/b/btrfs_progs.filelist index 26f9dc5aa..6d97bab02 100644 --- a/manifest/x86_64/b/btrfs_progs.filelist +++ b/manifest/x86_64/b/btrfs_progs.filelist @@ -1,4 +1,4 @@ -# Total size: 2934216 +# Total size: 6927354 /usr/local/bin/btrfs /usr/local/bin/btrfs-find-root /usr/local/bin/btrfs-image @@ -11,8 +11,6 @@ /usr/local/include/btrfs/ctree.h /usr/local/include/btrfs/ioctl.h /usr/local/include/btrfs/kerncompat.h -/usr/local/include/btrfs/list.h -/usr/local/include/btrfs/rbtree.h /usr/local/include/btrfs/rbtree_types.h /usr/local/include/btrfs/send-stream.h /usr/local/include/btrfs/send-utils.h @@ -23,12 +21,12 @@ /usr/local/lib64/libbtrfs.so /usr/local/lib64/libbtrfs.so.0 /usr/local/lib64/libbtrfs.so.0.1 -/usr/local/lib64/libbtrfs.so.0.1.3 +/usr/local/lib64/libbtrfs.so.0.1.4 /usr/local/lib64/libbtrfsutil.a /usr/local/lib64/libbtrfsutil.so /usr/local/lib64/libbtrfsutil.so.1 /usr/local/lib64/libbtrfsutil.so.1.3 -/usr/local/lib64/libbtrfsutil.so.1.3.1 +/usr/local/lib64/libbtrfsutil.so.1.3.2 /usr/local/lib64/pkgconfig/libbtrfsutil.pc /usr/local/lib64/udev/rules.d/64-btrfs-dm.rules /usr/local/lib64/udev/rules.d/64-btrfs-zoned.rules diff --git a/packages/btrfs_progs.rb b/packages/btrfs_progs.rb index f728e34e7..c984c82ed 100644 --- a/packages/btrfs_progs.rb +++ b/packages/btrfs_progs.rb @@ -3,18 +3,17 @@ require 'buildsystems/autotools' class Btrfs_progs < Autotools description 'BTRFS is a modern copy on write filesystem for Linux aimed at implementing advanced features while also focusing on fault tolerance, repair and easy administration.' homepage 'https://btrfs.readthedocs.io/en/latest/' - version '6.9' + version '6.17.1' license 'GPL-2' - compatibility 'all' + compatibility 'aarch64 armv7l x86_64' source_url 'https://github.com/kdave/btrfs-progs.git' git_hashtag "v#{version}" binary_compression 'tar.zst' binary_sha256({ - aarch64: 'b82e35f3745ec1d31ae24c99d9a1abd46830c576106280810cc0035ed23b181b', - armv7l: 'b82e35f3745ec1d31ae24c99d9a1abd46830c576106280810cc0035ed23b181b', - i686: 'bc6641ab32514d25078506a97456ab0556fb0b109f2874e138940cab57cc14b4', - x86_64: '5de03dcbd63e8741b54552cb2568766e7884eec1838cf4d52d2bf527bf5db790' + aarch64: '093314c5f1cf6c974bfea1c9980d7fb644850a53d14d2df05d41e499ede93b7a', + armv7l: '093314c5f1cf6c974bfea1c9980d7fb644850a53d14d2df05d41e499ede93b7a', + x86_64: 'caa3bfd5d60bae8f3fab608b5bcd5e1ee649eb4c4e5a7152599efcb0c33f2c3d' }) depends_on 'e2fsprogs' @@ -22,6 +21,8 @@ class Btrfs_progs < Autotools depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'libgcrypt' # R + depends_on 'libsodium' # R + depends_on 'libuuid' # R depends_on 'lzo' # R depends_on 'util_linux' # R depends_on 'zlib' # R diff --git a/tests/package/b/btrfs_progs b/tests/package/b/btrfs_progs new file mode 100755 index 000000000..b24c04684 --- /dev/null +++ b/tests/package/b/btrfs_progs @@ -0,0 +1,2 @@ +#!/bin/bash +for b in btrfs btrfs-image btrfstune mkfs.btrfs; do $b --version; done