添加dadk支持 (#263)

* 引入dadk,使用dadk0.1.1来编译test-relibc程序

* 由于gitee仓库体积限制导致无法继续使用gitee上的rust索引,因此更换为清华源

* github workflow的环境中,安装dadk

* Auto configure dragonos rust toolchain
This commit is contained in:
login
2023-05-11 16:17:58 +08:00
committed by GitHub
parent b11bb1b256
commit 7285c927d9
12 changed files with 134 additions and 29 deletions

View File

@ -123,7 +123,7 @@ rustInstall() {
echo "curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly"
exit
else
echo "是否为Rust换源为Gitee镜像源"
echo "是否为Rust换源为国内镜像源?(Tuna)"
echo "如果您在国内,我们推荐您这样做,以提升网络速度。"
echo "*WARNING* 这将会替换原有的镜像源设置。"
printf "(y/N): "
@ -141,6 +141,7 @@ rustInstall() {
rustup component add rust-src
rustup component add llvm-tools-preview
rustup target add x86_64-unknown-none
cargo install dadk
echo "Rust已经成功的在您的计算机上安装请运行 source ~/.cargo/env 以使rust在当前窗口生效"
fi
}

View File

@ -2,7 +2,7 @@
echo -e "[source.crates-io] \n \
registry = \"https://github.com/rust-lang/crates.io-index\" \n \
\n \
replace-with = 'dragonos-gitee' \n \
[source.dragonos-gitee] \n \
registry = \"https://gitee.com/DragonOS/crates.io-index.git\" \n \
replace-with = 'tuna' \n \
[source.tuna] \n \
registry = \"https://mirrors.tuna.tsinghua.edu.cn/git/crates.io-index.git\" \n \
" > ~/.cargo/config

View File

@ -90,7 +90,7 @@ mkdir -p ${root_folder}/bin/disk_mount/proc
mkdir -p ${root_folder}/bin/disk_mount/usr
cp -r ${root_folder}/bin/user/* ${root_folder}/bin/disk_mount/bin
touch ${root_folder}/bin/disk_mount/dev/keyboard.dev
cp -r ${root_folder}/bin/sysroot/usr/* ${root_folder}/bin/disk_mount/usr/
cp -r ${root_folder}/bin/sysroot/* ${root_folder}/bin/disk_mount/
# 设置 grub 相关数据
if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then