This is an automated email from the ASF dual-hosted git repository.
yuanz pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
The following commit(s) were added to refs/heads/master by this push:
new 3c21ba8 Update setup.sh (#70)
3c21ba8 is described below
commit 3c21ba85cb68b5c61ffb2327ed259dd2004d2afa
Author: Yuan Zhuang <[email protected]>
AuthorDate: Wed Apr 20 10:28:06 2022 +0800
Update setup.sh (#70)
* Fix checks in setup.sh
* Pin submodule rust to the latest version
---
setup.sh | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/setup.sh b/setup.sh
index 04fb8d5..c0864a7 100755
--- a/setup.sh
+++ b/setup.sh
@@ -34,7 +34,7 @@ rustup default nightly-2021-09-20
# initialize submodules: optee_os / optee_client / build
OPTEE_RELEASE_VERSION=3.16.0
-if [[ -z $OPTEE_DIR ]] || [[ $OPTEE_DIR==$PWD/optee ]]
+if [[ -z $OPTEE_DIR ]] || [[ $OPTEE_DIR == $PWD/optee ]]
then
OPTEE_DIR=$PWD/optee
echo optee dir: $OPTEE_DIR
@@ -82,18 +82,16 @@ fi
########################################################
# initialize submodules: rust / compiler-builtins / libc
-RUST_COMMIT_ID=6abda667852184641149d34da4730d96ba4f7d31
+RUST_COMMIT_ID=cb8a61693c80ebc615c2b66f40f0789cd16e699a
COMPILER_BUILTINS_COMMIT_ID=45a2e4996fe732172004b292b07397f9a02265ab
LIBC_COMMIT_ID=1ddfbbbc190bec0f5ec32b08e97585b34d0c6b09
-if [ ! -d rust/ ]
+if [ -d rust/ ]
then
- mkdir rust/
-else
- rm -r rust/*
+ rm -r rust/
fi
-cd rust
+mkdir rust && cd rust
git clone https://github.com/mesalock-linux/rust.git && \
(cd rust && \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
