Merge commit '9faa2e78e822024ac69fafbbe3ac300f42ae4572' of https://github.com/koverstreet/bcachefs-tools

This commit is contained in:
Kent Overstreet 2025-11-21 10:32:15 -05:00
commit ffd49ab645

View File

@ -10,13 +10,13 @@
%global dist .suse%{?suse_version}
%endif
# Disable the build for FUSE-based bcachefs
%bcond_with fuse
# Disable LTO for now until more testing can be done.
%global _lto_cflags %{nil}
# We don't want FUSE parts built.
# BCACHEFS_FUSE=1
%global make_opts VERSION="%{version}" BUILD_VERBOSE=1 PREFIX=%{_prefix} ROOT_SBINDIR=%{_sbindir}
%global make_opts VERSION="%{version}" %{?with_fuse:BCACHEFS_FUSE=1} BUILD_VERBOSE=1 PREFIX=%{_prefix} ROOT_SBINDIR=%{_sbindir}
%global MSRV 1.77
%global MINIMAL_KERNEL_VERSION_FOR_TOOLS 6.11.3
@ -85,7 +85,9 @@ BuildRequires: kernel-headers >= %{MINIMAL_KERNEL_VERSION_FOR_TOOLS}
BuildRequires: libaio-devel >= 0.3.111
BuildRequires: libattr-devel
BuildRequires: pkgconfig(blkid)
# BuildRequires: pkgconfig(fuse3) >= 3.7
%if %{with fuse}
BuildRequires: pkgconfig(fuse3) >= 3.7
%endif
BuildRequires: pkgconfig(libkeyutils)
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(libsodium)
@ -127,25 +129,27 @@ check, modify and correct any inconsistencies in the bcachefs filesystem.
%{_mandir}/man8/bcachefs.8*
%{_udevrulesdir}/64-bcachefs.rules
%if %{with fuse}
# ----------------------------------------------------------------------------
# %package -n fuse-bcachefs
# Summary: FUSE implementation of bcachefs
# Requires: %{name}%{?_isa} = %{version}-%{release}
#
# BuildArch: noarch
#
# %description -n fuse-bcachefs
# This package is an experimental implementation of bcachefs leveraging FUSE to
# mount, create, check, modify and correct any inconsistencies in the bcachefs filesystem.
#
# %files -n fuse-bcachefs
# %license COPYING
# %{_sbindir}/mount.fuse.bcachefs
# %{_sbindir}/fsck.fuse.bcachefs
# %{_sbindir}/mkfs.fuse.bcachefs
%package -n fuse-bcachefs
Summary: FUSE implementation of bcachefs
Requires: %{name}%{?_isa} = %{version}-%{release}
BuildArch: noarch
%description -n fuse-bcachefs
This package is an experimental implementation of bcachefs leveraging FUSE to
mount, create, check, modify and correct any inconsistencies in the bcachefs filesystem.
%files -n fuse-bcachefs
%license COPYING
%{_sbindir}/mount.fuse.bcachefs
%{_sbindir}/fsck.fuse.bcachefs
%{_sbindir}/mkfs.fuse.bcachefs
# ----------------------------------------------------------------------------
%endif
%package -n %{dkmsname}
Summary: Bcachefs kernel module managed by DKMS
@ -157,6 +161,12 @@ Requires: make
Requires: perl
Requires: python3
%if ! %{with fuse}
# Ensure that fuse-bcachefs is removed when it is disabled
Conflicts: fuse-bcachefs < %{version}-%{release}
Obsoletes: fuse-bcachefs < %{version}-%{release}
%endif
Requires: %{name} = %{version}-%{release}
# For Fedora/RHEL systems
@ -243,6 +253,11 @@ cp %{_sourcedir}/cargo.config $PWD/.cargo/config.toml
# Purge unneeded debian stuff
rm -rfv %{buildroot}/%{_datadir}/initramfs-tools
%if ! %{with fuse}
# Purge useless symlink stubs
rm -rf %{buildroot}%{_sbindir}/*.fuse.bcachefs
%endif
%if 0%{?_with_kmp} != 0
for kmp_flavor in %{?flavors_to_build}; do
%make_build \
@ -254,6 +269,8 @@ done
%endif
%changelog
* Fri Nov 21 2025 Neal Gompa <neal@gompa.dev>
- Turn off fuse-bcachefs by default
* Sun Nov 19 2025 Roman Lebedev <lebedev.ri@gmail.com>
- Implement KMP package for OpenSUSE Tumbleweed
* Sun Oct 19 2025 Roman Lebedev <lebedev.ri@gmail.com>