diff options
| author | HimbeerserverDE <himbeerserverde@gmail.com> | 2022-09-14 17:43:55 +0200 |
|---|---|---|
| committer | HimbeerserverDE <himbeerserverde@gmail.com> | 2022-09-14 17:43:55 +0200 |
| commit | e26e1f8b1c45348204c91603cf800a611f97d0e8 (patch) | |
| tree | 9f7ad47d0dacf61abe1a74228c3d333b4077e07f | |
| parent | 4484f7fc394a524feeb56e701841b788d8eb99c8 (diff) | |
Fix makefile to build and convert stage 2 properly
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2,17 +2,17 @@ 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 +stage2/target/x86-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 + ld -m elf_i386 -o stage2/target/x86-loadnothing/release/stage2.bin --oformat binary stage2/target/x86-loadnothing/release/stage2 -Ttext=0x7e00 + mv stage2/target/x86-loadnothing/release/stage2.bin stage2/target/x86-loadnothing/release/stage2 -nothing.img: magic.bin stage2/target/x86_64-loadnothing/release/stage2 stage1/boot.bin +nothing.img: magic.bin stage2/target/x86-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% @@ -21,7 +21,7 @@ nothing.img: magic.bin stage2/target/x86_64-loadnothing/release/stage2 stage1/bo doas losetup -d /dev/loop1 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 |