DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-09 02:46:47 +00:00
Code Issues Releases Wiki Activity

1. 修复bootstrap.sh在安装libssl-dev之前，安装dadk，从而导致错误的问题 (#338)

Browse Source 
1. 修复bootstrap.sh在安装libssl-dev之前，安装dadk，从而导致错误的问题
2. 构建系统的文档，补充对vnc端口的说明
This commit is contained in:
LoGin 2023-08-23 16:09:29 +08:00 committed by GitHub
parent 4537ffb7e9
commit f09a98329c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/introduction/build_system.md
View File

@ -241,4 +241,6 @@ make run-docker
:::{note} :::{note}
如果您需要在vnc中运行DragonOS，请在上述命令后加上`-vnc`后缀。如：`make run-vnc` 如果您需要在vnc中运行DragonOS，请在上述命令后加上`-vnc`后缀。如：`make run-vnc`
qemu虚拟机将在5900端口监听vnc连接。您可以使用vnc viewer或者Remmina连接至qemu虚拟机。
::: :::

5
tools/bootstrap.sh
View File

@ -142,7 +142,7 @@ rustInstall() {
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
rustup component add llvm-tools-preview rustup component add llvm-tools-preview
rustup target add x86_64-unknown-none rustup target add x86_64-unknown-none
cargo install dadk
echo "Rust已经成功的在您的计算机上安装！请运行 source ~/.cargo/env 以使rust在当前窗口生效！" echo "Rust已经成功的在您的计算机上安装！请运行 source ~/.cargo/env 以使rust在当前窗口生效！"
fi fi
} }
@ -206,6 +206,9 @@ else
fi fi
fi fi
# 安装dadk
cargo install dadk || exit 1
# 创建磁盘镜像 # 创建磁盘镜像
bash create_hdd_image.sh bash create_hdd_image.sh
# 编译安装GCC交叉编译工具链 # 编译安装GCC交叉编译工具链