Merge master into develop.

2022-07-07 11:11:46 -04:00
parent 821135d686 245f434aa4
commit 7ef9fd2f2d
3 changed files with 18 additions and 1 deletions
@@ -113,4 +113,7 @@ src/initscp/initfscp
 .DS_Store

 # OS filesystem files.
-files/bin/**
+files/bin/**
+
+# ISO creation files.
+iso/boot/*.bin
@@ -150,3 +150,10 @@ add_custom_target(
    DEPENDS libc
    DEPENDS gdb_file
 )
+
+add_custom_target(
+    cdrom.iso
+    COMMAND cp mentos/kernel-bootloader.bin ${CMAKE_SOURCE_DIR}/iso/boot
+    COMMAND grub-mkrescue -o cdrom.iso ${CMAKE_SOURCE_DIR}/iso
+    DEPENDS kernel-bootloader.bin
+)
@@ -0,0 +1,7 @@
+set timeout=1
+set default=0
+
+menuentry "MentOS" {
+     multiboot /boot/kernel-bootloader.bin
+     boot
+}