update limine to 9.x from 4.x

Author: braindigitalis

CMakeLists.txt

@@ -49,10 +49,10 @@ add_link_options("-m elf_x86_64 -nostdlib -no-pie -T buildtools/linker.ld")
 
 add_custom_target(ISO ALL DEPENDS ${CMAKE_BINARY_DIR}/rr.iso)
 
-copy_config(limine.cfg limine.cfg)
-copy_config(limine.sys limine/limine.sys)
-copy_config(limine-cd.bin limine/limine-cd.bin)
-copy_config(limine-efi.bin limine/limine-cd-efi.bin)
+copy_config(limine.conf limine.conf)
+copy_config(limine-bios.sys limine/limine-bios.sys)
+copy_config(limine-bios-cd.bin limine/limine-bios-cd.bin)
+copy_config(limine-uefi-cd.bin limine/limine-uefi-cd.bin)
 
 file(GLOB image_list ${CMAKE_SOURCE_DIR}/os/images/*)
 set(IMAGE_TARGETS "")

build-boot-image.php

@@ -91,7 +91,7 @@ function hasBinary(string $bin): bool
     fail("kernel symbols not found at '{$symbolPath}'");
 }
 
-$limineCfgSrc = $scriptDir . '/limine-hdd.cfg';
+$limineCfgSrc = $scriptDir . '/limine-hdd.conf';
 if (!is_file($limineCfgSrc)) {
     fail("limine-hdd.cfg not found next to this script ('{$limineCfgSrc}'). This is fatal.");
 }
@@ -116,7 +116,7 @@ function hasBinary(string $bin): bool
 
 echo ">> Copying files to boot image\n";
 runCommand("mcopy -i " . escapeshellarg($outImage) . " -sp " . escapeshellarg($limineBoot) . " ::/EFI/BOOT/BOOTX64.EFI");
-runCommand("mcopy -i " . escapeshellarg($outImage) . " -sp " . escapeshellarg($limineCfgSrc) . " ::/limine.cfg");
+runCommand("mcopy -i " . escapeshellarg($outImage) . " -sp " . escapeshellarg($limineCfgSrc) . " ::/limine.conf");
 runCommand("mcopy -i " . escapeshellarg($outImage) . " -sp " . escapeshellarg($kernelPath) . " ::/kernel.bin");
 runCommand("mcopy -i " . escapeshellarg($outImage) . " -sp " . escapeshellarg($symbolPath) . " ::/kernel.sym");
 

cmake/custom_targets.cmake

@@ -165,7 +165,7 @@ endfunction()
 function(iso TARGETFILE SOURCEFILE)
     set(OUTNAME "${CMAKE_BINARY_DIR}/${TARGETFILE}")
     add_custom_command(OUTPUT ${OUTNAME}
-        COMMAND php ../build-boot-image.php && xorriso -as mkisofs --quiet -b limine-cd.bin -joliet -no-emul-boot -boot-load-size 4 -boot-info-table -V "RETROROCKET" --protective-msdos-label "${CMAKE_BINARY_DIR}/iso" -o "${CMAKE_BINARY_DIR}/rr.iso"
+        COMMAND php ../build-boot-image.php && xorriso -as mkisofs --quiet -b limine-bios-cd.bin -joliet -no-emul-boot -boot-load-size 4 -boot-info-table -V "RETROROCKET" --protective-msdos-label "${CMAKE_BINARY_DIR}/iso" -o "${CMAKE_BINARY_DIR}/rr.iso"
         DEPENDS SYMBOLS "kernel.bin" "RUN_run.sh" "DEBUG_debug.sh" ${basic_program_list} ${basic_library_list} ${basic_driver_list} ${KEYMAP_TARGETS} ${TIMEZONE_TARGETS} ${CONFIG_TARGETS} ${IMAGE_TARGETS} ${MODULE_TARGETS})
-    add_dependencies(ISO SYMBOLS "kernel.bin" "RUN_run.sh" "DEBUG_debug.sh" "config_limine.cfg")
+    add_dependencies(ISO SYMBOLS "kernel.bin" "RUN_run.sh" "DEBUG_debug.sh" "config_limine.conf")
 endfunction()

limine-hdd.cfg

@@ -0,0 +1,13 @@
+timeout: 0
+interface_resolution: 1920x1080
+interface_branding: Retro Rocket
+interface_branding_color: 3;1;40
+randomize_memory: no
+
+/Retro Rocket
+    protocol: limine
+    resolution: 1920x1080x32
+    kaslr: no
+    path: boot():/kernel.bin
+    module_cmdline: Symbols
+    module_path: boot():/kernel.sym

limine-hdd.conf

@@ -0,0 +1,22 @@
+timeout: 5
+interface_resolution: 1920x1080
+interface_branding: Retro Rocket
+interface_branding_color: 3;1;40
+randomize_memory: no
+
+/Retro Rocket
+    protocol: limine
+    resolution: 1920x1080x32
+    kaslr: no
+    path: boot():/kernel.bin
+    module_cmdline: Symbols
+    module_path: boot():/kernel.sym
+
+/Install Retro Rocket
+    protocol: limine
+    resolution: 1920x1080x32
+    kaslr: no
+    path: boot():/kernel.bin
+    cmdline: install
+    module_cmdline: Symbols
+    module_path: boot():/kernel.sym

limine.cfg

@@ -1,6 +1,2 @@
-limine-deploy
-limine-deploy.exe
-limine-version
-limine-version.exe
-limine-enroll-config
-limine-enroll-config.exe
+limine
+limine.exe