From bb9de64c6dd413c549c4df384d2684eb9b81bb13 Mon Sep 17 00:00:00 2001 From: Arnau478 Date: Mon, 20 Jun 2022 13:48:40 +0200 Subject: [PATCH] GRUB-bootable ISO --- Makefile | 3 ++- config/grub.cfg | 3 +++ scripts/iso.mk | 6 ++++++ scripts/run.mk | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 config/grub.cfg create mode 100644 scripts/iso.mk diff --git a/Makefile b/Makefile index 102f460..946a0e5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ .PHONY: quark -quark: build-dir kernel +quark: build-dir kernel iso include config/.conf include scripts/toolchain.mk include scripts/kernel.mk include scripts/run.mk +include scripts/iso.mk .PHONY: build-dir build-dir: diff --git a/config/grub.cfg b/config/grub.cfg new file mode 100644 index 0000000..cf33aa5 --- /dev/null +++ b/config/grub.cfg @@ -0,0 +1,3 @@ +menuentry "Quark" { + multiboot /boot/kernel.bin +} diff --git a/scripts/iso.mk b/scripts/iso.mk new file mode 100644 index 0000000..e4c12b6 --- /dev/null +++ b/scripts/iso.mk @@ -0,0 +1,6 @@ +.PHONY: iso +iso: + @mkdir -p build/iso/boot/grub + @cp build/kernel.bin build/iso/boot/kernel.bin + @cp config/grub.cfg build/iso/boot/grub/grub.cfg + @grub-mkrescue -o build/quark.iso build/iso diff --git a/scripts/run.mk b/scripts/run.mk index 904cb18..31e557c 100644 --- a/scripts/run.mk +++ b/scripts/run.mk @@ -4,5 +4,5 @@ run: quark run-qemu .PHONY: run-qemu run-qemu: @echo -e $(ARROW) "Running on qemu..." - @qemu-system-i386 -kernel $(BUILD_DIR)/kernel.bin + @qemu-system-i386 $(BUILD_DIR)/quark.iso @echo -e $(ARROW) "Finished run"