mirror of
https://github.com/falk-werner/webfuse
synced 2024-10-27 20:34:10 +00:00
updated libfuse to 3.10.0, libwebsockets to 4.1.3
This commit is contained in:
Falk Werner
parent
72915f093d
commit
dffdfc8345
10
Makefile
10
Makefile
@ -41,11 +41,17 @@ FETCH_TARGETS += $(FETCHDIR)/dumb-init-$(DUMB_INIT_VERSION).tar.gz
|
||||
$(FETCHDIR)/dumb-init-$(DUMB_INIT_VERSION).tar.gz: URL := https://github.com/Yelp/dumb-init/archive/v${DUMB_INIT_VERSION}.tar.gz
|
||||
$(SKIP_MD5SUM)$(FETCHDIR)/dumb-init-$(DUMB_INIT_VERSION).tar.gz: MD5 := 6166084b05772cdcf615a762c6f3b32e
|
||||
|
||||
FUSE_VERSION ?= 3.9.2
|
||||
FUSE_VERSION ?= 3.10.0
|
||||
IMAGE_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 := 5a829d2fcaa19580adc56633721d323c
|
||||
$(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 22aec9bc9008eea6b17e203653d1b938
|
||||
|
||||
LWS_VERSION ?= 4.1.3
|
||||
IMAGE_BUILDARGS += LWS_VERSION=$(LWS_VERSION)
|
||||
FETCH_TARGETS += $(FETCHDIR)/libwebsockets-$(LWS_VERSION).tar.gz
|
||||
$(FETCHDIR)/libwebsockets-$(LWS_VERSION).tar.gz: URL := https://github.com/warmcat/libwebsockets/archive/v$(LWS_VERSION).tar.gz
|
||||
$(SKIP_MD5SUM)$(FETCHDIR)/libwebsockets-$(LWS_VERSION).tar.gz: MD5 := 413cbe790ccb089001f53b2ee167b9c2
|
||||
|
||||
QEMU_VERSION ?= v4.1.0-1
|
||||
IMAGE_BUILDARGS += QEMU_VERSION_=$(QEMU_VERSION)
|
||||
|
||||
@ -51,7 +51,7 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apk del .build-deps
|
||||
|
||||
ARG FUSE_VERSION=3.9.2
|
||||
ARG FUSE_VERSION=3.10.0
|
||||
|
||||
RUN set -x \
|
||||
&& builddeps="eudev-dev" \
|
||||
@ -63,6 +63,17 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apk del .build-deps
|
||||
|
||||
ARG LWS_VERSION=4.1.3
|
||||
|
||||
RUN set -x \
|
||||
&& builddir="/tmp/out" \
|
||||
&& mkdir -p "$builddir" \
|
||||
&& cd "$builddir" \
|
||||
&& cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& rm -rf "$builddir"
|
||||
|
||||
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
|
||||
ENV PKG_CONFIG_PATH=/usr/local/lib32/pkgconfig
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apt purge -y $builddeps
|
||||
|
||||
ARG FUSE_VERSION=3.9.2
|
||||
ARG FUSE_VERSION=3.10.0
|
||||
|
||||
RUN set -x \
|
||||
&& builddeps="udev gettext" \
|
||||
@ -61,6 +61,17 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apt purge -y $builddeps
|
||||
|
||||
ARG LWS_VERSION=4.1.3
|
||||
|
||||
RUN set -x \
|
||||
&& builddir="/tmp/out" \
|
||||
&& mkdir -p "$builddir" \
|
||||
&& cd "$builddir" \
|
||||
&& cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& rm -rf "$builddir"
|
||||
|
||||
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
|
||||
|
||||
ARG USERID=1000
|
||||
|
||||
@ -48,7 +48,7 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apk del .build-deps
|
||||
|
||||
ARG FUSE_VERSION=3.9.2
|
||||
ARG FUSE_VERSION=3.10.0
|
||||
|
||||
RUN set -x \
|
||||
&& builddeps="eudev-dev" \
|
||||
@ -60,6 +60,17 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apk del .build-deps
|
||||
|
||||
ARG LWS_VERSION=4.1.3
|
||||
|
||||
RUN set -x \
|
||||
&& builddir="/tmp/out" \
|
||||
&& mkdir -p "$builddir" \
|
||||
&& cd "$builddir" \
|
||||
&& cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& rm -rf "$builddir"
|
||||
|
||||
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
|
||||
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apt purge -y $builddeps
|
||||
|
||||
ARG FUSE_VERSION=3.9.2
|
||||
ARG FUSE_VERSION=3.10.0
|
||||
|
||||
RUN set -x \
|
||||
&& builddeps="udev gettext" \
|
||||
@ -58,6 +58,17 @@ RUN set -x \
|
||||
&& rm -rf "$builddir" \
|
||||
&& apt purge -y $builddeps
|
||||
|
||||
ARG LWS_VERSION=4.1.3
|
||||
|
||||
RUN set -x \
|
||||
&& builddir="/tmp/out" \
|
||||
&& mkdir -p "$builddir" \
|
||||
&& cd "$builddir" \
|
||||
&& cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& rm -rf "$builddir"
|
||||
|
||||
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
|
||||
|
||||
ARG USERID=1000
|
||||
|
||||
10
meson.build
10
meson.build
@ -2,14 +2,8 @@ project('webfuse', 'c', 'cpp', version: '0.6.0', license: 'LGPL-3.0+')
|
||||
|
||||
without_tests = get_option('without_tests')
|
||||
|
||||
libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0', required: false)
|
||||
if not libwebsockets_dep.found()
|
||||
cmake = import('cmake')
|
||||
libwebsockets = cmake.subproject('libwebsockets')
|
||||
libwebsockets_dep = libwebsockets.dependency('websockets_shared')
|
||||
endif
|
||||
|
||||
libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep'])
|
||||
libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0')
|
||||
libfuse_dep = dependency('fuse3', version: '>=3.8.0')
|
||||
|
||||
pkg_config = import('pkgconfig')
|
||||
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = libfuse-fuse-3.9.2
|
||||
|
||||
source_url = https://github.com/libfuse/libfuse/archive/fuse-3.9.2.tar.gz
|
||||
source_filename = fuse-3.9.2.tar.gz
|
||||
source_hash = b4409255cbda6f6975ca330f5b04cb335b823a95ddd8c812c3d224ec53478fc0
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
[wrap-file]
|
||||
directory = libwebsockets-4.0.13
|
||||
|
||||
source_url = https://github.com/warmcat/libwebsockets/archive/v4.0.13.zip
|
||||
source_filename = v4.0.13.zip
|
||||
source_hash = 0914ea3fdec496daf6b6a5c00f7ba1b52eb8cc3d55b66685df92920b232fd7a5
|
||||
Loading…
Reference in New Issue
Block a user