DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-08 18:26:48 +00:00
Code Issues Releases Wiki Activity

fix(tools): 调整bootstrap.sh脚本中的banner和依赖安装顺序 (#1144)

Browse Source 
- 修改bootstrap.sh的成功的banner: `make run`为`make run-nographic`以适应新需求。
- 优化rust组件安装逻辑，调整`cargo-binutils`和`bpf-linker`的安装位置，确保工具链配置正确。

Signed-off-by: longjin <longjin@dragonos.org>
This commit is contained in:
LoGin 2025-04-29 01:27:44 +08:00 committed by GitHub
parent 187a501f4b
commit ed0561424e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/bootstrap.sh
View File

@ -43,7 +43,7 @@ congratulations()
echo "| 请[关闭]当前终端, 并[重新打开]一个终端 |" echo "| 请[关闭]当前终端, 并[重新打开]一个终端 |"
echo "| 然后通过以下命令运行: |" echo "| 然后通过以下命令运行: |"
echo "| |" echo "| |"
echo "| make run |" echo "| make run-nographic |"
echo "| |" echo "| |"
echo "|------------------------------------------|" echo "|------------------------------------------|"
} }
@ -232,8 +232,7 @@ rustInstall() {
fi fi
echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引，请耐心等待..." 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-x86_64-unknown-linux-gnu
rustup toolchain install $RUST_VERSION_OLD-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 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 rust-src
rustup component add llvm-tools-preview rustup component add llvm-tools-preview
rustup default $RUST_VERSION rustup default $RUST_VERSION
cargo install cargo-binutils
cargo install bpf-linker
echo "Rust已经成功的在您的计算机上安装！请运行 source ~/.cargo/env 以使rust在当前窗口生效！" echo "Rust已经成功的在您的计算机上安装！请运行 source ~/.cargo/env 以使rust在当前窗口生效！"
fi fi