MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 23:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow not compiling FUSE when requested

Browse Source
This commit is contained in:
Wildan M 2026-01-01 21:30:07 +07:00
parent 29d7d2c6ac
commit 8470ecd84a
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/config.mk
View File

@ -157,6 +157,8 @@ INSTALLER=$(FSTOOLS)/bin/redox_installer
REDOXFS=$(FSTOOLS)/bin/redoxfs
REDOXFS_MKFS=$(FSTOOLS)/bin/redoxfs-mkfs
INSTALLER_OPTS=--cookbook=.
INSTALLER_FEATURES=
REDOXFS_FEATURES=
COOKBOOK_OPTS="--filesystem=$(FILESYSTEM_CONFIG)"
ifeq ($(REPO_BINARY),1)
INSTALLER_OPTS+=--repo-binary
@ -164,6 +166,8 @@ COOKBOOK_OPTS+=--repo-binary
endif
ifeq ($(FSTOOLS_NO_MOUNT),1)
INSTALLER_OPTS+=--no-mount
INSTALLER_FEATURES=--no-default-features --features installer
REDOXFS_FEATURES= --no-default-features --features std,log
endif
REPO_TAG=$(BUILD)/repo.tag

7
mk/fstools.mk
View File

@ -13,16 +13,15 @@ endif
else
rm -rf $@ $@.partial
mkdir -p $@.partial
ln -sr recipes $@.partial/recipes
ln -s ../../recipes $@.partial/recipes
# Install cookbook, installer, and redoxfs for host (may be outside of podman container)
#TODO: Build and install installer and redoxfs using cookbook?
cd $@.partial && \
export CARGO_TARGET_DIR=../$@-target && \
$(HOST_CARGO) install --root . --path ../.. --locked && \
env -u RUSTUP_TOOLCHAIN ./bin/repo fetch installer redoxfs && \
$(HOST_CARGO) install --root . --path recipes/core/installer/source && \
$(HOST_CARGO) install --root . --path recipes/core/redoxfs/source
$(HOST_CARGO) install --root . --path recipes/core/installer/source $(INSTALLER_FEATURES) && \
$(HOST_CARGO) install --root . --path recipes/core/redoxfs/source $(REDOXFS_FEATURES)
mv $@.partial $@
touch $@