Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2024-10-27 20:34:10 +00:00
Code Issues Releases Wiki Activity

updated libfuse to 3.8.0

Browse Source
This commit is contained in:
Falk Werner 2019-12-01 20:27:10 +01:00
parent 7a79c5e8a9
commit 494035e5a6
7 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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 $(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 $(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) DOCKER_BUILDARGS += FUSE_VERSION=$(FUSE_VERSION)
FETCH_TARGETS += $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz 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 $(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 WEBSOCKETS_VERSION ?= 3.2.0
DOCKER_BUILDARGS += WEBSOCKETS_VERSION=$(WEBSOCKETS_VERSION) DOCKER_BUILDARGS += WEBSOCKETS_VERSION=$(WEBSOCKETS_VERSION)

17
README.md
View File

@ -409,13 +409,16 @@ By default, unit tests and example application are enabled. You can disable them
#### libfuse #### libfuse
wget -O fuse-3.1.1.tar.gz https://github.com/libfuse/libfuse/archive/fuse-3.1.1.tar.gz To install libfuse, meson is neede. Please refer to [meson quick guide](https://mesonbuild.com/Quick-guide.html) for setup instructions.
tar -xf fuse-3.1.1.tar.gz
cd libfuse-fuse-3.1.1 wget -O fuse-3.8.0.tar.gz https://github.com/libfuse/libfuse/archive/fuse-3.8.0.tar.gz
./makeconf.sh tar -xf fuse-3.8.0.tar.gz
./configure cd libfuse-fuse-3.8.0
make mkdir .build
sudo make install cd .build
meson ..
ninja
sudo ninja install
#### libwebsockets #### libwebsockets

17
build/amd64-alpine-builder.dockerfile
View File

@ -50,18 +50,23 @@ RUN set -x \
&& make "$PARALLELMFLAGS" install \ && make "$PARALLELMFLAGS" install \
&& rm -rf "$builddir" && 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 \ 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 \ && apk add --no-cache --virtual .build-deps $builddeps \
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& ./makeconf.sh \
&& builddir="/tmp/out" \ && builddir="/tmp/out" \
&& mkdir -p "$builddir" \ && mkdir -p "$builddir" \
&& cd "$builddir" \ && cd "$builddir" \
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& make "$PARALLELMFLAGS" install \ && meson configure -Dexamples=false \
&& ninja \
&& ninja install \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apk del .build-deps && apk del .build-deps

14
build/amd64-ubuntu-builder.dockerfile
View File

@ -49,18 +49,22 @@ RUN set -x \
&& make "$PARALLELMFLAGS" install \ && make "$PARALLELMFLAGS" install \
&& rm -rf "$builddir" && 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 \ RUN set -x \
&& builddeps="libtool automake gettext" \ && builddeps="libtool automake gettext" \
&& apt install --yes --no-install-recommends $builddeps \ && apt install --yes --no-install-recommends $builddeps \
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& ./makeconf.sh \
&& builddir="/tmp/out" \ && builddir="/tmp/out" \
&& mkdir -p "$builddir" \ && mkdir -p "$builddir" \
&& cd "$builddir" \ && cd "$builddir" \
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& make "$PARALLELMFLAGS" install \ && ninja \
&& ninja install \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apt purge -y $builddeps && apt purge -y $builddeps

16
build/arm32v7-alpine-builder.dockerfile
View File

@ -54,18 +54,22 @@ RUN set -x \
&& make "$PARALLELMFLAGS" install \ && make "$PARALLELMFLAGS" install \
&& rm -rf "$builddir" && 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 \ 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 \ && apk add --no-cache --virtual .build-deps $builddeps \
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& ./makeconf.sh \
&& builddir="/tmp/out" \ && builddir="/tmp/out" \
&& mkdir -p "$builddir" \ && mkdir -p "$builddir" \
&& cd "$builddir" \ && cd "$builddir" \
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& make "$PARALLELMFLAGS" install \ && ninja \
&& ninja install \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apk del .build-deps && apk del .build-deps

14
build/arm32v7-ubuntu-builder.dockerfile
View File

@ -52,18 +52,22 @@ RUN set -x \
&& make "$PARALLELMFLAGS" install \ && make "$PARALLELMFLAGS" install \
&& rm -rf "$builddir" && 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 \ RUN set -x \
&& builddeps="libtool automake gettext" \ && builddeps="libtool automake gettext" \
&& apt install --yes --no-install-recommends $builddeps \ && apt install --yes --no-install-recommends $builddeps \
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& ./makeconf.sh \
&& builddir="/tmp/out" \ && builddir="/tmp/out" \
&& mkdir -p "$builddir" \ && mkdir -p "$builddir" \
&& cd "$builddir" \ && cd "$builddir" \
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \ && meson "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& make "$PARALLELMFLAGS" install \ && ninja \
&& ninja install \
&& rm -rf "$builddir" \ && rm -rf "$builddir" \
&& apt purge -y $builddeps && apt purge -y $builddeps

2
lib/webfuse/adapter/impl/fuse_wrapper.h
View File

@ -5,7 +5,7 @@
extern "C" { extern "C" {
#endif #endif
#define FUSE_USE_VERSION 31 #define FUSE_USE_VERSION 38
#include <fuse_lowlevel.h> #include <fuse_lowlevel.h>
#ifdef __cplusplus #ifdef __cplusplus