Unbreak again

[loadnothing.git] / Makefile

diff --git a/Makefile b/Makefile
index 1cd8e25f3ab8db59dbddcf235f89608b444965db..69fc9a6d04e891f4aff9ed8c53af07c37320798a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,29 +2,22 @@ default_target: vm
 .PHONY: vm clean
 
 stage1/boot.bin: stage1/boot.asm
-       nasm -DSTAGE2SIZE=$$(du -b stage2/target/x86_64-loadnothing/release/stage2 | cut -f1) -f bin -o stage1/boot.bin stage1/boot.asm
+       nasm -DSTAGE2SIZE=$$(du -b stage2/target/x86-loadnothing/release/stage2 | cut -f1) -f bin -o stage1/boot.bin stage1/boot.asm
 
 magic.bin:
        echo -en "\x55\xAA" > magic.bin
 
-stage2/target/x86_64-loadnothing/release/stage2: stage2/src/main.rs
-       cd stage2 && cargo rustc --release -- --emit=obj
-       ld -o stage2/target/x86_64-loadnothing/release/stage2.bin --oformat binary stage2/target/x86_64-loadnothing/release/stage2 -Ttext=0x7e00
-       mv stage2/target/x86_64-loadnothing/release/stage2.bin stage2/target/x86_64-loadnothing/release/stage2
+stage2/target/x86-loadnothing/release/stage2: stage2/src/main.rs stage2/src/vga.rs
+       cd stage2 && cargo build --release
 
-nothing.img: magic.bin stage2/target/x86_64-loadnothing/release/stage2 stage1/boot.bin
-       dd if=/dev/zero of=nothing.img bs=32M count=1
-       parted -s nothing.img mklabel msdos
-       parted -s -a optimal nothing.img mkpart primary fat32 16MiB 100%
-       doas losetup /dev/loop1 nothing.img
-       doas mkfs.fat /dev/loop1p1
-       doas losetup -d /dev/loop1
+nothing.img: magic.bin stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin
+       cp -p base.img nothing.img
        dd if=stage1/boot.bin of=nothing.img bs=1 count=446 conv=notrunc
        dd if=magic.bin of=nothing.img bs=1 seek=510 count=2 conv=notrunc
-       dd if=stage2/target/x86_64-loadnothing/release/stage2 of=nothing.img bs=512 seek=1 conv=notrunc
+       dd if=stage2/target/x86-loadnothing/release/stage2 of=nothing.img bs=512 seek=1 conv=notrunc
 
 vm: nothing.img
-       qemu-system-x86_64 -hda nothing.img
+       qemu-system-x86_64 -drive format=raw,file=nothing.img
 
 clean:
        rm -f magic.bin stage1/boot.bin nothing.img