fix: classroom setup

Signed-off-by: YdrMaster <ydrml@hotmail.com>
This commit is contained in:
YdrMaster
2022-10-20 12:38:01 +08:00
parent 3a4e7e5479
commit e2eab27576
3 changed files with 20 additions and 21 deletions

View File

@@ -2,7 +2,6 @@ DOCKER_NAME ?= rust-os-camp-2022
DIR := workplace
.PHONY: docker build_docker
test: test3 test4 test5 test6 test7 test8
lab1: test3
@@ -23,7 +22,7 @@ setup:
cp -r ci-user ${DIR}
cp -r bootloader ${DIR}
cp -r reports ${DIR}
cp rust-toolchain ${DIR}
cp rust-toolchain.toml ${DIR}
# export PATH=${PATH}:${HOME}/qemu-7.0.0:${HOME}/qemu-7.0.0/riscv64-softmmu
test1: setup
@@ -65,7 +64,7 @@ clean:
docker:
docker run --rm -it -v ${PWD}:/mnt -w /mnt ${DOCKER_NAME} bash
build_docker:
build_docker:
docker build -t ${DOCKER_NAME} .
setupclassroom_test1:
@@ -164,7 +163,7 @@ setupclassroom_test8:
git commit -m"update classroom.yml .keep autograding.json for classroom CI test"
git push
# for local ubuntu with zsh shell SHELL, need root for sudo
# for local ubuntu with zsh shell SHELL, need root for sudo
ubuntu_local_setenv:
sudo apt install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev \
gawk build-essential bison flex texinfo gperf libtool patchutils bc \
@@ -181,7 +180,7 @@ ubuntu_local_setenv:
rustc --version
# for github codespaces ubuntu with zsh SHELL, need root for sudo
codespaces_setenv:
codespaces_setenv:
sudo apt install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev \
gawk build-essential bison flex texinfo gperf libtool patchutils bc \
zlib1g-dev libexpat-dev pkg-config libglib2.0-dev libpixman-1-dev git tmux python3 ninja-build zsh -y
@@ -194,4 +193,4 @@ codespaces_setenv:
qemu-riscv64 --version
curl https://sh.rustup.rs -sSf | sh -s -- -y
/bin/zsh && source /home/codespace/.cargo/env
rustc --version
rustc --version