From c1d948ce1973d9be37a43718f548776a0061807b Mon Sep 17 00:00:00 2001
From: James Barnett <noreply@jamesbarnett.xyz>
Date: Sat, 1 Sep 2018 12:41:34 +0100
Subject: Add Makefile task to create bootable iso

---
 .gitignore                  |  4 +++-
 Makefile                    | 12 +++++++++---
 boot-iso/boot/grub/grub.cfg |  6 ++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 boot-iso/boot/grub/grub.cfg

diff --git a/.gitignore b/.gitignore
index 6c30d7c..3fc404a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,6 @@ Mkfile.old
 dkms.conf
 
 bin/
-.vscode/
\ No newline at end of file
+.vscode/
+*.bin
+*.iso
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 919334d..76fe6e1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,18 @@ build: setup kernel/kernel.c kernel/io/vga/text_mode_display.c kernel/kernel-boo
 	nasm -f elf32 kernel/kernel-bootstrap.asm -o bin/kernel-bootstrap.o
 	$(CC) $(CFLAGS) -c kernel/kernel.c -o bin/kernel.o
 	$(CC) $(CFLAGS) -c kernel/io/vga/text_mode_display.c -o bin/text_mode_display.o
-	ld -m elf_i386 -T link.ld -o bin/kernel bin/*.o
+	ld -m elf_i386 -T link.ld -o bin/kernel.bin bin/*.o
 
 clean:
 	rm -f bin/*
+	rm -f boot-iso/boot/kernel.bin
+	rm -f tinyOS.iso
 
 run:
-	qemu-system-i386 -kernel bin/kernel
+	qemu-system-i386 -kernel bin/kernel.bin
 
-build-and-run: build run
\ No newline at end of file
+build-and-run: build run
+
+iso: build
+	cp bin/kernel.bin boot-iso/boot/
+	grub-mkrescue -o tinyOS.iso boot-iso/
\ No newline at end of file
diff --git a/boot-iso/boot/grub/grub.cfg b/boot-iso/boot/grub/grub.cfg
new file mode 100644
index 0000000..93aedb6
--- /dev/null
+++ b/boot-iso/boot/grub/grub.cfg
@@ -0,0 +1,6 @@
+set timeout=0
+set default=0
+
+menuentry "tinyOS" {
+  multiboot /boot/kernel.bin
+} 
\ No newline at end of file
-- 
cgit v1.2.3