cmd,packaging: build and install snapfuse

This patch enables the build system bits for snapfuse.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

.gitignore

@@ -28,6 +28,10 @@ cmd/snap-update-ns/unit-tests
 cmd/system-shutdown/system-shutdown
 cmd/system-shutdown/unit-tests
 
+# snapfuse
+cmd/swap.[ch].inc
+cmd/snapfuse/snapfuse
+
 # manual pages
 cmd/*/*.[1-9]
 

cmd/Makefile.am

@@ -419,3 +419,52 @@ system_shutdown_unit_tests_LDADD = libsnap-confine-private.a
 system_shutdown_unit_tests_CFLAGS = $(GLIB_CFLAGS)
 system_shutdown_unit_tests_LDADD +=  $(GLIB_LIBS)
 endif
+
+bin_PROGRAMS = snapfuse/snapfuse
+snapfuse_snapfuse_CFLAGS = $(FUSE_CFLAGS)
+snapfuse_snapfuse_LDADD = $(FUSE_LIBS)
+snapfuse_snapfuse_SOURCES = \
+	snapfuse/cache.c \
+	snapfuse/cache.h \
+	snapfuse/common.h \
+	snapfuse/decompress.c \
+	snapfuse/decompress.h \
+	snapfuse/dir.c \
+	snapfuse/dir.h \
+	snapfuse/file.c \
+	snapfuse/file.h \
+	snapfuse/fs.c \
+	snapfuse/fs.h \
+	snapfuse/fuseprivate.c \
+	snapfuse/fuseprivate.h \
+	snapfuse/hash.c \
+	snapfuse/hash.h \
+	snapfuse/hl.c \
+	snapfuse/nonstd-enoattr.c \
+	snapfuse/nonstd-internal.h \
+	snapfuse/nonstd-makedev.c \
+	snapfuse/nonstd-pread.c \
+	snapfuse/nonstd-stat.c \
+	snapfuse/nonstd.h \
+	snapfuse/squashfs_fs.h \
+	snapfuse/squashfuse.h \
+	snapfuse/stack.c \
+	snapfuse/stack.h \
+	snapfuse/swap.c \
+	snapfuse/swap.h \
+	snapfuse/table.c \
+	snapfuse/table.h \
+	snapfuse/traverse.c \
+	snapfuse/traverse.h \
+	snapfuse/util.c \
+	snapfuse/util.h \
+	snapfuse/xattr.c \
+	snapfuse/xattr.h
+
+$(snapfuse_snapfuse_OBJECTS): swap.c.inc
+
+# Handle generation of swap include files
+CLEANFILES = swap.h.inc swap.c.inc
+EXTRA_DIST += swap.h.inc swap.c.inc
+swap.h.inc swap.c.inc: snapfuse/gen_swap.sh snapfuse/squashfs_fs.h
+	SED="sed" $(srcdir)/snapfuse/gen_swap.sh $(srcdir)/snapfuse/squashfs_fs.h

cmd/configure.ac

@@ -109,6 +109,7 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [
 # Those are now used unconditionally even if apparmor is disabled.
 PKG_CHECK_MODULES([LIBUDEV], [libudev])
 PKG_CHECK_MODULES([UDEV], [udev])
+PKG_CHECK_MODULES([FUSE], [fuse])
 
 # Check if libcap is available.
 # PKG_CHECK_MODULES([LIBCAP], [libcap])
@@ -209,5 +210,7 @@ AC_ARG_ENABLE([static-libseccomp],
     esac], [enable_static_libseccomp=no])
 AM_CONDITIONAL([STATIC_LIBSECCOMP], [test "x$enable_static_libseccomp" = "xyes"])
 
+AC_DEFINE([FUSE_USE_VERSION], [26], [Version of FUSE API to use])
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

packaging/ubuntu-16.04/control

@@ -20,9 +20,13 @@ Build-Depends: autoconf,
                golang-any (>=2:1.6) | golang-1.6,
                indent,
                init-system-helpers,
-               libcap-dev,
                libapparmor-dev,
+               libcap-dev,
+               libfuse-dev,
                libglib2.0-dev,
+               liblz4-dev,
+               liblzma-dev,
+               liblzo2-dev,
                libseccomp-dev,
                libudev-dev,
                openssh-client,
@@ -32,7 +36,8 @@ Build-Depends: autoconf,
                python3-markdown,
                squashfs-tools,
                udev,
-               xfslibs-dev
+               xfslibs-dev,
+               zlib1g-dev
 Standards-Version: 3.9.7
 Homepage: https://github.com/snapcore/snapd
 Vcs-Browser: https://github.com/snapcore/snapd

packaging/ubuntu-16.04/snapd.install

@@ -29,3 +29,5 @@ usr/share/man/man5/snap-discard-ns.5
 # for compatibility with ancient snap installs that wrote the shell based
 # wrapper scripts instead of the modern symlinks
 usr/bin/ubuntu-core-launcher
+
+usr/bin/snapfuse