Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Aug 23, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/introduction/build_system.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,4 +241,6 @@ make run-docker

:::{note}
如果您需要在vnc中运行DragonOS，请在上述命令后加上`-vnc`后缀。如：`make run-vnc`

qemu虚拟机将在5900端口监听vnc连接。您可以使用vnc viewer或者Remmina连接至qemu虚拟机。
:::
5 changes: 4 additions & 1 deletion tools/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ rustInstall() {
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
rustup component add llvm-tools-preview
rustup target add x86_64-unknown-none
cargo install dadk

echo "Rust已经成功的在您的计算机上安装！请运行 source ~/.cargo/env 以使rust在当前窗口生效！"
fi
}
Expand Down Expand Up @@ -206,6 +206,9 @@ else
fi
fi

# 安装dadk
cargo install dadk || exit 1

# 创建磁盘镜像
bash create_hdd_image.sh
# 编译安装GCC交叉编译工具链
Expand Down