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

Build cookbook rust program before running fetch or ci-pkg

Browse source
This commit is contained in:
Jeremy Soller 2020-08-27 10:17:25 -06:00
parent 1b24a2394b
commit 1510f4d30f
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -41,6 +41,7 @@ update:
cargo update --manifest-path redoxfs/Cargo.toml cargo update --manifest-path redoxfs/Cargo.toml
fetch: fetch:
cargo build --manifest-path cookbook/Cargo.toml --release
cd cookbook && ./fetch.sh \ cd cookbook && ./fetch.sh \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \ "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)" "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
@ -82,6 +83,7 @@ ci-img: FORCE
# CI packaging target # CI packaging target
ci-pkg: prefix FORCE ci-pkg: prefix FORCE
cargo build --manifest-path cookbook/Cargo.toml --release
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
PACKAGES="$$(cargo run --manifest-path installer/Cargo.toml -- --list-packages -c ci.toml)" && \ PACKAGES="$$(cargo run --manifest-path installer/Cargo.toml -- --list-packages -c ci.toml)" && \
cd cookbook && \ cd cookbook && \