diff --git a/Makefile b/Makefile index a77927d..760c2d5 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,6 @@ all: config clear: config @make -C src clear --no-print-directory -run: config - @make -C test run --no-print-directory - -debug: config - @make -C test debug --no-print-directory - config: @if [ "${shell uname -s}" != "Linux" ]; then \ echo -e "\e[1;33mMetaverse\e[0m must build under \e[1;35mLinux\e[0m or itself."; \ diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index 0b51200..0000000 --- a/test/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -TARGET = ../src/metaverse.elf -ARCH := $(shell uname -m) - -.PHONY: run debug load mount unmount - -BIOS = bios/${ARCH}/OVMF_CODE.fd - -run: - @doas modprobe nbd - @make load - @qemu-system-${ARCH} -m 4G metaverse.img -bios ${BIOS} - -debug: - @echo "在gdb中连接远程目标'localhost:1234'即可" - @doas modprobe nbd - @make load - @qemu-system-${ARCH} -m 4G metaverse.img -bios ${BIOS} -s -S - -create: - @qemu-img create -f qcow2 metaverse.img 512M - @doas modprobe nbd - @doas qemu-nbd --connect=/dev/nbd0 metaverse.img - @doas partprobe /dev/nbd0 - @echo "你需要为这个虚拟磁盘写入一个GPT分区表并分出efi分区和根分区。" - @doas fdisk /dev/nbd0 - @doas mkfs.fat -F 32 /dev/nbd0p1 - @doas mkfs.fat -F 32 /dev/nbd0p2 - @doas mount /dev/nbd0p2 mnt/ - @doas mount -m /dev/nbd0p1 mnt/boot/ - @doas mkdir mnt/boot/EFI/ - @make unmount - -load: - @echo loading kernel ... - @make mount - @doas cp ${TARGET} mnt/boot/ - @make unmount - -mount: - @doas modprobe nbd - @doas qemu-nbd --connect=/dev/nbd0 metaverse.img - @doas partprobe /dev/nbd0 - @doas mount /dev/nbd0p2 mnt/ - @doas mount /dev/nbd0p1 mnt/boot/ - -unmount: - @sync - @doas umount /dev/nbd0p1 - @doas umount /dev/nbd0p2 - @doas qemu-nbd --disconnect /dev/nbd0 diff --git a/test/bios/x86_64/MICROVM.4m.fd b/test/bios/x86_64/MICROVM.4m.fd deleted file mode 100644 index 894a967..0000000 Binary files a/test/bios/x86_64/MICROVM.4m.fd and /dev/null differ diff --git a/test/bios/x86_64/MICROVM.fd b/test/bios/x86_64/MICROVM.fd deleted file mode 100644 index 9dd441c..0000000 Binary files a/test/bios/x86_64/MICROVM.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF.4m.fd b/test/bios/x86_64/OVMF.4m.fd deleted file mode 100644 index 1ccdf98..0000000 Binary files a/test/bios/x86_64/OVMF.4m.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF.fd b/test/bios/x86_64/OVMF.fd deleted file mode 100644 index e1248c5..0000000 Binary files a/test/bios/x86_64/OVMF.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_CODE.4m.fd b/test/bios/x86_64/OVMF_CODE.4m.fd deleted file mode 100644 index b0da3aa..0000000 Binary files a/test/bios/x86_64/OVMF_CODE.4m.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_CODE.csm.4m.fd b/test/bios/x86_64/OVMF_CODE.csm.4m.fd deleted file mode 100644 index c4a28ad..0000000 Binary files a/test/bios/x86_64/OVMF_CODE.csm.4m.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_CODE.csm.fd b/test/bios/x86_64/OVMF_CODE.csm.fd deleted file mode 100644 index b2f8e8f..0000000 Binary files a/test/bios/x86_64/OVMF_CODE.csm.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_CODE.fd b/test/bios/x86_64/OVMF_CODE.fd deleted file mode 100644 index 7f766e2..0000000 Binary files a/test/bios/x86_64/OVMF_CODE.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_CODE.secboot.4m.fd b/test/bios/x86_64/OVMF_CODE.secboot.4m.fd deleted file mode 100644 index 153436f..0000000 Binary files a/test/bios/x86_64/OVMF_CODE.secboot.4m.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_CODE.secboot.fd b/test/bios/x86_64/OVMF_CODE.secboot.fd deleted file mode 100644 index ce797c0..0000000 Binary files a/test/bios/x86_64/OVMF_CODE.secboot.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_VARS.4m.fd b/test/bios/x86_64/OVMF_VARS.4m.fd deleted file mode 100644 index efb4f46..0000000 Binary files a/test/bios/x86_64/OVMF_VARS.4m.fd and /dev/null differ diff --git a/test/bios/x86_64/OVMF_VARS.fd b/test/bios/x86_64/OVMF_VARS.fd deleted file mode 100644 index 3b8bb9b..0000000 Binary files a/test/bios/x86_64/OVMF_VARS.fd and /dev/null differ