Skip to content

Commit

Permalink
Initial version of composefs-fuse
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Larsson <alexl@redhat.com>
  • Loading branch information
alexlarsson committed Jun 15, 2023
1 parent 9a08fa7 commit f5fed9f
Show file tree
Hide file tree
Showing 4 changed files with 1,261 additions and 2 deletions.
15 changes: 15 additions & 0 deletions configure.ac
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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
10 changes: 9 additions & 1 deletion 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
Expand All @@ -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

Expand Down

0 comments on commit f5fed9f

Please sign in to comment.