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

Use cargo fetch when cookbook_redoxer not found

Browse Source
This commit is contained in:
Jeremy Soller 2025-11-20 17:34:55 -07:00
parent 8a81e1f82c
commit 04ab545cb7
No known key found for this signature in database
GPG Key ID: 670FDFB5428E05CA
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mk/fstools.mk
View File

@ -14,17 +14,15 @@ else
rm -rf $@ $@.partial
mkdir -p $@.partial
ln -sr recipes $@.partial/recipes
ln -sr $@-target $@.partial/target
# Install cookbook, installer, and redoxfs for host (may be outside of podman container)
#TODO: Build and install installer and redoxfs using cookbook?
export CARGO_TARGET_DIR=$@.partial/target && \
$(HOST_CARGO) install --root $@.partial --path . && \
cd $@.partial && \
./bin/repo fetch installer redoxfs && \
cd ../.. && \
$(HOST_CARGO) install --root $@.partial --path recipes/core/installer/source && \
$(HOST_CARGO) install --root $@.partial --path recipes/core/redoxfs/source
cd $@.partial && \
export CARGO_TARGET_DIR=../$@-target && \
$(HOST_CARGO) install --root . --path ../.. && \
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
mv $@.partial $@
touch $@

2
src/cook/fetch.rs
View File

@ -405,7 +405,7 @@ pub(crate) fn fetch_cargo(
} else {
let cookbook_redoxer = Path::new("target/release/cookbook_redoxer")
.canonicalize()
.unwrap_or(PathBuf::from("/bin/false"));
.unwrap_or(PathBuf::from("cargo"));
Command::new(&cookbook_redoxer)
};
command.arg("fetch");