From 8470ecd84a2fc0681d72f2d2305474ca07f532cf Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 1 Jan 2026 21:30:07 +0700 Subject: [PATCH] Allow not compiling FUSE when requested --- mk/config.mk | 4 ++++ mk/fstools.mk | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mk/config.mk b/mk/config.mk index 8b1b3ed1..a1a72a31 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -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 diff --git a/mk/fstools.mk b/mk/fstools.mk index 0a294b9c..4ee5cf32 100644 --- a/mk/fstools.mk +++ b/mk/fstools.mk @@ -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 $@