Merge pull request #112 from alexlarsson/cfs-fuse

WIP Initial version of cfs-fuse

configure.ac

@@ -176,6 +176,21 @@ else
 fi
 AM_CONDITIONAL([USE_YAJL],[test "$have_libyajl" = "yes"])
 
+AC_ARG_WITH(fuse,
+        AS_HELP_STRING([--with-fuse], [Build fuse support [default=auto]]),
+        , with_fuse=auto)
+if test "x$with_fuse" != "xno"; then
+  PKG_CHECK_MODULES(FUSE3, [fuse3 >= 3.10.0], [have_fuse3=yes], [have_fuse3=no])
+  if test $have_fuse3 = yes; then
+    AC_DEFINE(HAVE_FUSE3, 1, [Define if fuse3 is available])
+  elif test "x$with_fuse" == "xyes"; then
+    AC_MSG_ERROR([fuse was requested but fuse3 it could not be found])
+  fi
+else
+   have_fuse3=no
+fi
+AM_CONDITIONAL([USE_FUSE3],[test "$have_fuse3" = "yes"])
+
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_FSEEKO
 AC_HEADER_MAJOR

hacking/installdeps.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -xeuo pipefail
 export DEBIAN_FRONTEND=noninteractive
-apt-get install -y automake libtool autoconf autotools-dev git make gcc libyajl-dev libssl-dev libfsverity-dev pkg-config
+apt-get install -y automake libtool autoconf autotools-dev git make gcc libyajl-dev libssl-dev libfsverity-dev pkg-config libfuse3-dev

tools/Makefile.am

@@ -1,11 +1,15 @@
 bin_PROGRAMS = mkcomposefs
 sbin_PROGRAMS = mount.composefs
-noinst_PROGRAMS = 
+noinst_PROGRAMS =
 
 if USE_YAJL
 noinst_PROGRAMS += composefs-from-json
 endif
 
+if USE_FUSE3
+noinst_PROGRAMS += composefs-fuse
+endif
+
 AM_CFLAGS = $(WARN_CFLAGS) -I$(top_srcdir)/
 
 mkcomposefs_SOURCES = mkcomposefs.c
@@ -17,6 +21,10 @@ mount_composefs_LDADD = ../libcomposefs/libcomposefs.la $(LIBCRYPTO_LIBS)
 composefs_from_json_SOURCES = composefs-from-json.c read-file.c read-file.h
 composefs_from_json_LDADD = ../libcomposefs/libcomposefs.la $(LIBS_YAJL) $(LIBCRYPTO_LIBS) $(LIBS_SECCOMP)
 
+composefs_fuse_SOURCES = cfs-fuse.c
+composefs_fuse_LDADD =   ../libcomposefs/libcomposefs.la $(FUSE3_LIBS)
+composefs_fuse_CFLAGS = $(FUSE3_CFLAGS)
+
 TEST_ASSETS_SMALL = \
 	config.json.gz config-with-hard-link.json.gz