Merge pull request #477 from LebedevRI/fuse

Further FUSE packaging touchups

.github/workflows/obs.yml

@@ -289,6 +289,7 @@ jobs:
           -Version:        0%{?_version}
           +Version:        $VER
           EOF
+          rm -f "$OBS_REPO_DIR/bcachefs-tools.spec.orig"
           git add .
       - name: Ensure that all OBS repo state entries are signed, or sign them
         timeout-minutes: 1

Makefile

@@ -183,9 +183,11 @@ install: all install_dkms
 	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.bcachefs
 	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.bcachefs
 	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.bcachefs
+ifdef BCACHEFS_FUSE
 	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.fuse.bcachefs
 	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.fuse.bcachefs
 	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.fuse.bcachefs
+endif
 
 .PHONY: install_dkms
 install_dkms: dkms/dkms.conf

bcachefs-tools.spec

@@ -253,11 +253,6 @@ 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 \

debian/bcachefs-tools.install

@@ -1,11 +1,8 @@
 usr/lib/udev/rules.d/64-bcachefs.rules
 usr/sbin/bcachefs
 usr/sbin/fsck.bcachefs
-usr/sbin/fsck.fuse.bcachefs
 usr/sbin/mkfs.bcachefs
-usr/sbin/mkfs.fuse.bcachefs
 usr/sbin/mount.bcachefs
-usr/sbin/mount.fuse.bcachefs
 usr/share/man/man8/bcachefs.8
 usr/share/initramfs-tools/hooks/bcachefs
 usr/share/initramfs-tools/scripts/local-premount/bcachefs

debian/control

@@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 13),
                libaio-dev (>= 0.3.111),
                libblkid-dev,
                libclang-dev:native,
-               libfuse3-dev,
+#              libfuse3-dev,
                libkeyutils-dev,
                liblz4-dev,
                libscrypt-dev,