DemesneGH commented on code in PR #285:
URL:
https://github.com/apache/teaclave-trustzone-sdk/pull/285#discussion_r2916925784
##########
setup_std_dependencies.sh:
##########
@@ -25,12 +25,19 @@ cd "$(dirname "$0")"
##########################################
# install Xargo if not exist
-which xargo || cargo install xargo
+if ! command -v xargo >/dev/null 2>&1; then
+ # xargo 0.3.26 does not compile on recent toolchains (TryLockError API
change).
+ # Build it with an older known-good nightly.
+ # Since we're working on migrating to cargo -Z build-std, we can remove
the xargo then.
+
XARGO_BOOTSTRAP_TOOLCHAIN=${XARGO_BOOTSTRAP_TOOLCHAIN:-nightly-2024-05-15}
+ rustup toolchain install "$XARGO_BOOTSTRAP_TOOLCHAIN" --profile minimal
+ cargo +"$XARGO_BOOTSTRAP_TOOLCHAIN" install xargo --locked
+fi
##########################################
-# initialize submodules: rust / libc
-RUST_BRANCH=optee-xargo
-LIBC_BRANCH=optee
+# initialize submodules: rust / libc / patches
+RUST_COMMIT=01f6ddf7588f42ae2d7eb0a2f21d44e8e96674cf # rust 1.93.1 stable
release
Review Comment:
For the previous approach we maintain the fork of whole repo, so we can
define a branch name; The current approach pins the specific commit in upstream
Rust, we only maintain the patch in `teaclave-crates`. Seems we cannot have a
branch name like that. Any suggestions?
---
Update: change to use the tag name with `depth=1`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
