From ed0561424e3a261a84ccf6600631f453cb51fac6 Mon Sep 17 00:00:00 2001 From: LoGin Date: Tue, 29 Apr 2025 01:27:44 +0800 Subject: [PATCH] =?UTF-8?q?fix(tools):=20=E8=B0=83=E6=95=B4bootstrap.sh?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=B8=AD=E7=9A=84banner=E5=92=8C=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=AE=89=E8=A3=85=E9=A1=BA=E5=BA=8F=20(#1144)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改bootstrap.sh的成功的banner: `make run`为`make run-nographic`以适应新需求。 - 优化rust组件安装逻辑，调整`cargo-binutils`和`bpf-linker`的安装位置，确保工具链配置正确。 Signed-off-by: longjin --- tools/bootstrap.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh index 33a8e1a3..fd2e68b9 100755 --- a/tools/bootstrap.sh +++ b/tools/bootstrap.sh @@ -43,7 +43,7 @@ congratulations() echo "| 请[关闭]当前终端, 并[重新打开]一个终端 |" echo "| 然后通过以下命令运行: |" echo "| |" - echo "| make run |" + echo "| make run-nographic |" echo "| |" echo "|------------------------------------------|" } @@ -232,8 +232,7 @@ rustInstall() { fi echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引，请耐心等待..." - cargo install cargo-binutils - cargo install bpf-linker + rustup toolchain install $RUST_VERSION-x86_64-unknown-linux-gnu rustup toolchain install $RUST_VERSION_OLD-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu @@ -255,6 +254,8 @@ rustInstall() { rustup component add rust-src rustup component add llvm-tools-preview rustup default $RUST_VERSION + cargo install cargo-binutils + cargo install bpf-linker echo "Rust已经成功的在您的计算机上安装！请运行 source ~/.cargo/env 以使rust在当前窗口生效！" fi