vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-fusermount-for-gentoo' into 'master'

Browse source 
Detect installed fusermount or fusermount3 binary

See merge request redox-os/redox!1322
This commit is contained in:
Jeremy Soller 2023-03-21 20:12:53 +00:00
parent dabd655621 b0feb1b423
commit 5acde0ab8b
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap.sh
View file

@ -353,7 +353,7 @@ gentoo()
echo "Installing git..." echo "Installing git..."
sudo emerge dev-vcs/git sudo emerge dev-vcs/git
fi fi
if [ -z "$(which fusermount)" ]; then if [ -z "$(which fusermount 2>/dev/null)" ] && [ -z "$(which fusermount3 2>/dev/null)" ]; then
echo "Installing fuse..." echo "Installing fuse..."
sudo emerge sys-fs/fuse sudo emerge sys-fs/fuse
fi fi

8
mk/config.mk
View file

@ -42,7 +42,13 @@ else ifeq ($(UNAME),FreeBSD)
VBM=VBoxManage VBM=VBoxManage
HOST_TARGET ?= $(HOST_ARCH)-unknown-freebsd HOST_TARGET ?= $(HOST_ARCH)-unknown-freebsd
else else
FUMOUNT=fusermount -u # Detect which version of the fusermount binary is available.
ifneq (, $(shell which fusermount3))
FUMOUNT=fusermount3 -u
else
FUMOUNT=fusermount -u
endif
export NPROC=nproc export NPROC=nproc
export REDOX_MAKE=make export REDOX_MAKE=make
VB_AUDIO=pulse VB_AUDIO=pulse

2
podman_bootstrap.sh
View file

@ -291,7 +291,7 @@ gentoo()
echo "Installing git..." echo "Installing git..."
sudo emerge dev-vcs/git sudo emerge dev-vcs/git
fi fi
if [ -z "$(which fusermount)" ]; then if [ -z "$(which fusermount 2>/dev/null)" ] && [ -z "$(which fusermount3 2>/dev/null)" ]; then
echo "Installing fuse..." echo "Installing fuse..."
sudo emerge sys-fs/fuse sudo emerge sys-fs/fuse
fi fi