[packages/bcachefs-tools] - updated to 1.38.2, now builds again (with kernel 7.0.0 headers)

[qboosh]

commit 56189ee1fad67aedc095378065ff7962dcbb497d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun May 10 11:02:33 2026 +0200

    - updated to 1.38.2, now builds again (with kernel 7.0.0 headers)

 bcachefs-tools.spec | 25 ++++++++++++++-----------
 rust-target.patch   | 31 ++++++++++---------------------
 2 files changed, 24 insertions(+), 32 deletions(-)
---
diff --git a/bcachefs-tools.spec b/bcachefs-tools.spec
index b314d1a..8de64bc 100644
--- a/bcachefs-tools.spec
+++ b/bcachefs-tools.spec
@@ -1,12 +1,12 @@
 Summary:	Userspace tools for bcachefs
 Summary(pl.UTF-8):	Narzędzia przestrzeni użytkownika do bcachefs
 Name:		bcachefs-tools
-Version:	1.13.0
+Version:	1.38.2
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://evilpiepirate.org/bcachefs-tools/%{name}-vendored-%{version}.tar.zst
-# Source0-md5:	5ee95803cdd9b2a591b38537d13b027c
+# Source0-md5:	2ac6404d9ace898a393c3811914905a6
 Patch0:		rust-target.patch
 URL:		https://bcachefs.org/
 BuildRequires:	cargo
@@ -16,6 +16,8 @@ BuildRequires:	clang-devel
 %else
 BuildRequires:	clang-devel(x86-64)
 %endif
+# -std=gnu11
+BuildRequires:	gcc >= 6:4.7
 BuildRequires:	keyutils-devel
 BuildRequires:	libaio-devel
 BuildRequires:	libblkid-devel
@@ -25,7 +27,8 @@ BuildRequires:	libuuid-devel
 BuildRequires:	llvm-devel
 BuildRequires:	lz4-devel
 BuildRequires:	pkgconfig
-BuildRequires:	rust >= 1.77
+BuildRequires:	rpmbuild(macros) >= 2.012
+BuildRequires:	rust >= 1.85
 BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
@@ -98,6 +101,9 @@ export LIBCLANG_PATH=/usr/lib64
 	PREFIX="%{_prefix}" \
 	ROOT_SBINDIR="%{_sbindir}" \
 	LIBEXECDIR="%{_libexecdir}" \
+	CC="%{__cc}" \
+	EXTRA_CFLAGS="%{rpmcflags}" \
+	EXTRA_LDFLAGS="%{rpmldflags}" \
 	CARGO="%__cargo" \
 	CARGO_BUILD_ARGS="-v --release --target %rust_target" \
 	CARGO_TARGET="%rust_target"
@@ -115,17 +121,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/mkfs.fuse.bcachefs
 %attr(755,root,root) %{_sbindir}/mount.bcachefs
 %attr(755,root,root) %{_sbindir}/mount.fuse.bcachefs
-%attr(755,root,root) %{_libexecdir}/bcachefsck_all
-%attr(755,root,root) %{_libexecdir}/bcachefsck_fail
-%{systemdunitdir}/bcachefsck at .service
-%{systemdunitdir}/bcachefsck_all.service
-%{systemdunitdir}/bcachefsck_all.timer
-%{systemdunitdir}/bcachefsck_all_fail.service
-%{systemdunitdir}/bcachefsck_fail at .service
-%{systemdunitdir}/system-bcachefsck.slice
+%{systemdunitdir}/bcachefs-wait-devices at .service
 /lib/udev/rules.d/64-bcachefs.rules
+%{bash_compdir}/bcachefs
 %{_mandir}/man8/bcachefs.8*
 
+# dkms subpackage?
+#%{_prefix}/src/bcachefs-%{version}
+
 # initramfs subpackage?
 #%{_datadir}/initramfs-tools/hooks/bcachefs
 #%{_datadir}/initramfs-tools/scripts/local-premount/bcachefs
diff --git a/rust-target.patch b/rust-target.patch
index 775dc34..367dea4 100644
--- a/rust-target.patch
+++ b/rust-target.patch
@@ -1,25 +1,14 @@
---- bcachefs-tools-1.7.0/Makefile.orig	2024-05-23 22:32:41.238838991 +0200
-+++ bcachefs-tools-1.7.0/Makefile	2024-05-24 16:34:59.100373730 +0200
-@@ -59,6 +59,13 @@ CARGO_PROFILE=release
- # CARGO_PROFILE=debug
+--- bcachefs-tools-1.38.2/Makefile.orig	2026-04-28 16:39:29.000000000 +0200
++++ bcachefs-tools-1.38.2/Makefile	2026-05-09 22:07:50.841427797 +0200
+@@ -31,6 +31,11 @@ else
+   CARGO_CLEAN_ARGS = --quiet
+ endif
  
- CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
-+
 +ifdef CARGO_TARGET
 +	CARGO_BUILD_ARGS += --target $(CARGO_TARGET)
-+	CARGO_TARGET_DIR := target/$(CARGO_TARGET)
-+else
-+	CARGO_TARGET_DIR := target
++	CARGO_BUILD_TARGET = $(CARGO_TARGET)
 +endif
- CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
- 
- CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS)
-@@ -201,7 +208,7 @@ cmd_version.o : .version
- install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
- install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
- install: bcachefs $(optional_install)
--	$(INSTALL) -m0755 -D target/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
-+	$(INSTALL) -m0755 -D $(CARGO_TARGET_DIR)/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
- 	$(INSTALL) -m0644 -D bcachefs.8    -t $(DESTDIR)$(PREFIX)/share/man/man8/
- 	$(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)
- 	$(INSTALL) -m0755 -D initramfs/hook   $(DESTDIR)$(INITRAMFS_HOOK)
++
+ # when cross compiling, cargo places the built binary in a different location
+ ifdef CARGO_BUILD_TARGET
+ 	BUILT_BIN = target/$(CARGO_BUILD_TARGET)/release/bcachefs
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bcachefs-tools.git/commitdiff/56189ee1fad67aedc095378065ff7962dcbb497d