From e063be8ce1cb2da52a0892c1a7ec6a3f50af9afa Mon Sep 17 00:00:00 2001
From: liangxinyan <liangxinyan2@huawei.com>
Date: Mon, 31 Mar 2025 17:17:52 +0800
Subject: [PATCH 1/4] SSS Signed-off-by: liangxinyan <liangxinyan2@huawei.com>

---
 rust_build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust_build.sh b/rust_build.sh
index d56d40e1496..7e28b281a74 100644
--- a/rust_build.sh
+++ b/rust_build.sh
@@ -77,6 +77,7 @@ pushd $CURRENT_DIR > /dev/null
 	fi
 	cp -rf tmp_rust/library/backtrace/* library/backtrace/
     
+    mkdir -p ~/.cargo && touch ~/.cargo/config && chmod 777 ~/.cargo/config 
     cat > ~/.cargo/config <<EOF
 [source.crates-io]
 replace-with = 'ustc'
-- 
Gitee


From 10100f2b19f12b264a71a9ffb841e9d931fb9121 Mon Sep 17 00:00:00 2001
From: liangxinyan123 <liangxinyan2@huawei.com>
Date: Tue, 1 Apr 2025 01:18:36 +0000
Subject: [PATCH 2/4] update rust_build.sh.

Signed-off-by: liangxinyan123 <liangxinyan2@huawei.com>
---
 rust_build.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rust_build.sh b/rust_build.sh
index 7e28b281a74..dcb5e7aa041 100644
--- a/rust_build.sh
+++ b/rust_build.sh
@@ -77,13 +77,16 @@ pushd $CURRENT_DIR > /dev/null
 	fi
 	cp -rf tmp_rust/library/backtrace/* library/backtrace/
     
-    mkdir -p ~/.cargo && touch ~/.cargo/config && chmod 777 ~/.cargo/config 
-    cat > ~/.cargo/config <<EOF
+    mkdir -p ~/.cargo && touch ~/.cargo/config.toml && chmod 777 ~/.cargo/config.toml
+    cat > ~/.cargo/config.toml <<EOF
 [source.crates-io]
 replace-with = 'ustc'
 
 [source.ustc]
 registry = "https://mirrors.ustc.edu.cn/crates.io-index"
+
+[net]
+git-fetch-with-cli = true  # 强制使用 git 命令行（避免 libgit2 问题）
 EOF
 
     echo "stage2 build start ..." > build.log
-- 
Gitee


From c2f2054ed05d436266bc7e6fb5ebe8a27177e4cb Mon Sep 17 00:00:00 2001
From: liangxinyan123 <liangxinyan2@huawei.com>
Date: Tue, 1 Apr 2025 07:51:37 +0000
Subject: [PATCH 3/4] update rust_build.sh.

Signed-off-by: liangxinyan123 <liangxinyan2@huawei.com>
---
 rust_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust_build.sh b/rust_build.sh
index dcb5e7aa041..a6eae5c7c28 100644
--- a/rust_build.sh
+++ b/rust_build.sh
@@ -99,7 +99,7 @@ EOF
     echo "dist rust build end" >> build.log
 popd > /dev/null
 
-EXTRA_PATH = $CURRENT_DIR/extra
+EXTRA_PATH=$CURRENT_DIR/extra
 pushd $EXTRA_PATH/rustlib > /dev/null
     unzip src.zip
 popd > /dev/null
-- 
Gitee


From 79016c8fa78d3a8e2372766bfbc000d35c6b8d77 Mon Sep 17 00:00:00 2001
From: liangxinyan123 <liangxinyan2@huawei.com>
Date: Wed, 2 Apr 2025 01:30:17 +0000
Subject: [PATCH 4/4] update rust_build.sh.

Signed-off-by: liangxinyan123 <liangxinyan2@huawei.com>
---
 rust_build.sh | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/rust_build.sh b/rust_build.sh
index a6eae5c7c28..a842387463a 100644
--- a/rust_build.sh
+++ b/rust_build.sh
@@ -3,6 +3,18 @@ set -e
 
 CURRENT_DIR=$(pwd)
 
+mkdir -p ~/.cargo && touch ~/.cargo/config.toml && chmod 777 ~/.cargo/config.toml
+cat > ~/.cargo/config.toml <<EOF
+[source.crates-io]
+replace-with = 'ustc'
+
+[source.ustc]
+registry = "https://mirrors.ustc.edu.cn/crates.io-index"
+
+[net]
+git-fetch-with-cli = true  # 强制使用 git 命令行（避免 libgit2 问题）
+EOF
+
 pushd $CURRENT_DIR > /dev/null
 	# 获取rust_std包
 	mkdir -p build/cache/2025-01-09
@@ -76,27 +88,15 @@ pushd $CURRENT_DIR > /dev/null
 	  mkdir -p library/backtrace
 	fi
 	cp -rf tmp_rust/library/backtrace/* library/backtrace/
-    
-    mkdir -p ~/.cargo && touch ~/.cargo/config.toml && chmod 777 ~/.cargo/config.toml
-    cat > ~/.cargo/config.toml <<EOF
-[source.crates-io]
-replace-with = 'ustc'
-
-[source.ustc]
-registry = "https://mirrors.ustc.edu.cn/crates.io-index"
-
-[net]
-git-fetch-with-cli = true  # 强制使用 git 命令行（避免 libgit2 问题）
-EOF
 
-    echo "stage2 build start ..." > build.log
-    python3 x.py build --stage 2 >> build.log
-    echo "stage2 build end" >> build.log
+    echo "stage2 build start ..."
+    python3 x.py build --stage 2
+    echo "stage2 build end"
 
-    echo "dist rust-dev build start ..." >> build.log
-    python3 x.py dist rustc cargo rustfmt clippy rust-analyzer miri llvm-tools >> build.log
-	python3 x.py dist >> build.log
-    echo "dist rust build end" >> build.log
+    echo "dist rust-dev build start ..."
+    python3 x.py dist rustc cargo rustfmt clippy rust-analyzer miri llvm-tools 
+	python3 x.py dist
+    echo "dist rust build end"
 popd > /dev/null
 
 EXTRA_PATH=$CURRENT_DIR/extra
@@ -111,6 +111,7 @@ fi
 
 echo "start add extra files"
 pushd $CURRENT_DIR/build/dist > /dev/null
+    ls -alh $CURRENT_DIR/build/dist/
     tar -zxvf rust-1.85.0-dev-x86_64-unknown-linux-gnu.tar.gz
     package_dir="rust-1.85.0-dev-x86_64-unknown-linux-gnu"
     pushd rust-1.85.0-dev-x86_64-unknown-linux-gnu > /dev/null
-- 
Gitee