rust: fix make optee-rust
In some environments it has been noted that the Rust setup fails with a
netowrk error [1]. It seems to be an issue with the built-in Git
library, a workaround being to tell the Rust setup to use the Git
command instead. This commit does exactly that, regardless of the
environment.
Note: I chose not to restore the OP-TEE Rust build commands removed by
[1] in order to reduce the size of the image ($TOP/optee_rust is 1.8GB
after building) and avoid disk space issues in the "make check (QEMUv8)"
job which uses this image but doesn't build the Rust tests. The "make
check-rust (QEMUv8)" job will do whataver it takes.
Link: [1] https://github.com/jforissier/docker_optee_os_ci/commit/6d7f39aec9436168e5e4ce44c4b6f7791575e313
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Yuan Zhuang <zhuangyuan04@baidu.com>
diff --git a/common.mk b/common.mk
index d4a5514..ef74c27 100644
--- a/common.mk
+++ b/common.mk
@@ -542,7 +542,9 @@
$(OPTEE_RUST_PATH)/.done:
ifeq ($(OPTEE_RUST_ENABLE),y)
- @(export OPTEE_DIR=$(ROOT) && cd $(OPTEE_RUST_PATH) && ./setup.sh && touch .done)
+ @(export OPTEE_DIR=$(ROOT) && \
+ export CARGO_NET_GIT_FETCH_WITH_CLI=true && \
+ cd $(OPTEE_RUST_PATH) && ./setup.sh && touch .done)
endif
optee-rust-clean: