Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox

2024-02-10 10:40:02 -07:00 · 2024-02-10 10:40:02 -07:00 · 659dbb4a99
parent e3221aa0a8 be4db6b213
commit 659dbb4a99
3 changed files with 3 additions and 2 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -15,7 +15,7 @@ before_script:
        build-essential \
        curl \
        flex \
-        fuse \
+        fuse3 \
        git \
        libfuse-dev \
        nasm \
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -389,6 +389,7 @@ ubuntu()
 		doxygen \
 		file \
 		flex \
+		fuse3 \
 		g++ \
 		genisoimage \
 		git \
--- a/podman/redox-base-containerfile
+++ b/podman/redox-base-containerfile
@ -12,7 +12,7 @@ RUN apt-get update \
        curl \
        file \
        flex \
-        fuse \
+        fuse3 \
        genisoimage \
        git \
        gperf \