MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-09 04:58:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'single-cookbook' into 'master'

Browse Source 
Avoid compiling cookbook on host

See merge request redox-os/redox!1801
This commit is contained in:
Wildan Mubarok 2026-01-02 11:09:29 +00:00
commit b26d87c2d1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mk/fstools.mk
View File

@ -3,7 +3,7 @@
fstools: $(FSTOOLS_TAG) $(FSTOOLS) fstools: $(FSTOOLS_TAG) $(FSTOOLS)
# These tools run inside Podman if it is used, or on the host if Podman is not used # These tools run inside Podman if it is used, or on the host if Podman is not used
$(FSTOOLS): $(CONTAINER_TAG) $(FSTOOLS): | prefix $(CONTAINER_TAG) $(FSTOOLS_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
ifeq ($(FSTOOLS_IN_PODMAN),1) ifeq ($(FSTOOLS_IN_PODMAN),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
@ -14,12 +14,11 @@ else
rm -rf $@ $@.partial rm -rf $@ $@.partial
mkdir -p $@.partial mkdir -p $@.partial
ln -s ../../recipes $@.partial/recipes ln -s ../../recipes $@.partial/recipes
$(MAKE) fstools_fetch PODMAN_BUILD=$(SKIP_CHECK_TOOLS)
# Install cookbook, installer, and redoxfs for host (may be outside of podman container) # Compile installer and redoxfs for host (may be outside of podman container)
cd $@.partial && \ cd $@.partial && \
export CARGO_TARGET_DIR=../$@-target && \ 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 $(INSTALLER_FEATURES) && \ $(HOST_CARGO) install --root . --path recipes/core/installer/source $(INSTALLER_FEATURES) && \
$(HOST_CARGO) install --root . --path recipes/core/redoxfs/source $(REDOXFS_FEATURES) $(HOST_CARGO) install --root . --path recipes/core/redoxfs/source $(REDOXFS_FEATURES)
@ -27,11 +26,19 @@ else
touch $@ touch $@
endif endif
$(FSTOOLS_TAG): $(FSTOOLS) fstools_fetch: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
./target/release/repo fetch installer redoxfs
endif
$(FSTOOLS_TAG):
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
else else
$(HOST_CARGO) build --manifest-path Cargo.toml --release --locked $(HOST_CARGO) build --manifest-path Cargo.toml --release --locked
mkdir -p $(@D)
touch $@ touch $@
endif endif

2
mk/repo.mk
View File

@ -1,6 +1,6 @@
# Configuration file for recipe commands # Configuration file for recipe commands
$(REPO_TAG): prefix $(FILESYSTEM_CONFIG) | $(FSTOOLS_TAG) $(CONTAINER_TAG) $(REPO_TAG): prefix $(FILESYSTEM_CONFIG) | $(FSTOOLS) $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
else else