diff --git a/Makefile b/Makefile index 5b3aeaf..01c9f3d 100644 --- a/Makefile +++ b/Makefile @@ -56,11 +56,11 @@ FETCH_TARGETS += $(FETCHDIR)/googletest-release-$(GTEST_VERSION).tar.gz $(FETCHDIR)/googletest-release-$(GTEST_VERSION).tar.gz: URL := https://github.com/google/googletest/archive/release-$(GTEST_VERSION).tar.gz $(SKIP_MD5SUM)$(FETCHDIR)/googletest-release-$(GTEST_VERSION).tar.gz: MD5 := ecd1fa65e7de707cd5c00bdac56022cd -FUSE_VERSION ?= 3.1.1 +FUSE_VERSION ?= 3.8.0 DOCKER_BUILDARGS += FUSE_VERSION=$(FUSE_VERSION) FETCH_TARGETS += $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: URL := https://github.com/libfuse/libfuse/archive/fuse-$(FUSE_VERSION).tar.gz -$(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 097f194856938afdd98bea1a5c046edd +$(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 909d6b2cfc2faa9f4b6033d356280540 WEBSOCKETS_VERSION ?= 3.2.0 DOCKER_BUILDARGS += WEBSOCKETS_VERSION=$(WEBSOCKETS_VERSION) diff --git a/README.md b/README.md index 733f872..1062e1c 100644 --- a/README.md +++ b/README.md @@ -409,13 +409,16 @@ By default, unit tests and example application are enabled. You can disable them #### libfuse - wget -O fuse-3.1.1.tar.gz https://github.com/libfuse/libfuse/archive/fuse-3.1.1.tar.gz - tar -xf fuse-3.1.1.tar.gz - cd libfuse-fuse-3.1.1 - ./makeconf.sh - ./configure - make - sudo make install +To install libfuse, meson is neede. Please refer to [meson quick guide](https://mesonbuild.com/Quick-guide.html) for setup instructions. + + wget -O fuse-3.8.0.tar.gz https://github.com/libfuse/libfuse/archive/fuse-3.8.0.tar.gz + tar -xf fuse-3.8.0.tar.gz + cd libfuse-fuse-3.8.0 + mkdir .build + cd .build + meson .. + ninja + sudo ninja install #### libwebsockets diff --git a/build/amd64-alpine-builder.dockerfile b/build/amd64-alpine-builder.dockerfile index c2a3096..e13924a 100644 --- a/build/amd64-alpine-builder.dockerfile +++ b/build/amd64-alpine-builder.dockerfile @@ -50,18 +50,23 @@ RUN set -x \ && make "$PARALLELMFLAGS" install \ && rm -rf "$builddir" -ARG FUSE_VERSION=3.1.1 +RUN set -x \ + && builddeps="linux-headers udev eudev-dev python3 py3-pip py3-setuptools py3-cryptography ninja" \ + && apk add --no-cache --virtual .build-deps $builddeps \ + && pip3 install meson + +ARG FUSE_VERSION=3.8.0 RUN set -x \ - && builddeps="libtool automake autoconf gettext-dev m4 linux-headers" \ + && builddeps="libtool automake autoconf gettext-dev m4" \ && apk add --no-cache --virtual .build-deps $builddeps \ - && cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ - && ./makeconf.sh \ && builddir="/tmp/out" \ && mkdir -p "$builddir" \ && cd "$builddir" \ - && "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ - && make "$PARALLELMFLAGS" install \ + && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ + && meson configure -Dexamples=false \ + && ninja \ + && ninja install \ && rm -rf "$builddir" \ && apk del .build-deps diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile index bd0f707..acd51ac 100644 --- a/build/amd64-ubuntu-builder.dockerfile +++ b/build/amd64-ubuntu-builder.dockerfile @@ -49,18 +49,22 @@ RUN set -x \ && make "$PARALLELMFLAGS" install \ && rm -rf "$builddir" -ARG FUSE_VERSION=3.1.1 +RUN set -x \ + && builddeps="udev python3 python3-pip python3-setuptools python3-wheel ninja-build" \ + && apt install --yes --no-install-recommends $builddeps \ + && pip3 install --system meson + +ARG FUSE_VERSION=3.8.0 RUN set -x \ && builddeps="libtool automake gettext" \ && apt install --yes --no-install-recommends $builddeps \ - && cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ - && ./makeconf.sh \ && builddir="/tmp/out" \ && mkdir -p "$builddir" \ && cd "$builddir" \ - && "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ - && make "$PARALLELMFLAGS" install \ + && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ + && ninja \ + && ninja install \ && rm -rf "$builddir" \ && apt purge -y $builddeps diff --git a/build/arm32v7-alpine-builder.dockerfile b/build/arm32v7-alpine-builder.dockerfile index 3405ee9..63f910e 100644 --- a/build/arm32v7-alpine-builder.dockerfile +++ b/build/arm32v7-alpine-builder.dockerfile @@ -54,18 +54,22 @@ RUN set -x \ && make "$PARALLELMFLAGS" install \ && rm -rf "$builddir" -ARG FUSE_VERSION=3.1.1 +RUN set -x \ + && builddeps="linux-headers udev eudev-dev python3 py3-pip py3-setuptools py3-cryptography ninja" \ + && apk add --no-cache --virtual .build-deps $builddeps \ + && pip3 install meson + +ARG FUSE_VERSION=3.8.0 RUN set -x \ - && builddeps="libtool automake autoconf gettext-dev m4 linux-headers" \ + && builddeps="libtool automake autoconf gettext-dev m4" \ && apk add --no-cache --virtual .build-deps $builddeps \ - && cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ - && ./makeconf.sh \ && builddir="/tmp/out" \ && mkdir -p "$builddir" \ && cd "$builddir" \ - && "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ - && make "$PARALLELMFLAGS" install \ + && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ + && ninja \ + && ninja install \ && rm -rf "$builddir" \ && apk del .build-deps diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile index efb2957..1b4f735 100644 --- a/build/arm32v7-ubuntu-builder.dockerfile +++ b/build/arm32v7-ubuntu-builder.dockerfile @@ -52,18 +52,22 @@ RUN set -x \ && make "$PARALLELMFLAGS" install \ && rm -rf "$builddir" -ARG FUSE_VERSION=3.1.1 +RUN set -x \ + && builddeps="udev python3 python3-pip python3-setuptools python3-wheel ninja-build" \ + && apt install --yes --no-install-recommends $builddeps \ + && pip3 install --system meson + +ARG FUSE_VERSION=3.8.0 RUN set -x \ && builddeps="libtool automake gettext" \ && apt install --yes --no-install-recommends $builddeps \ - && cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ - && ./makeconf.sh \ && builddir="/tmp/out" \ && mkdir -p "$builddir" \ && cd "$builddir" \ - && "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ - && make "$PARALLELMFLAGS" install \ + && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \ + && ninja \ + && ninja install \ && rm -rf "$builddir" \ && apt purge -y $builddeps diff --git a/lib/webfuse/adapter/impl/fuse_wrapper.h b/lib/webfuse/adapter/impl/fuse_wrapper.h index 719d758..b234e73 100644 --- a/lib/webfuse/adapter/impl/fuse_wrapper.h +++ b/lib/webfuse/adapter/impl/fuse_wrapper.h @@ -5,7 +5,7 @@ extern "C" { #endif -#define FUSE_USE_VERSION 31 +#define FUSE_USE_VERSION 38 #include #ifdef __cplusplus