From 1046713c15428d8e17c74ec2addef3c4b2382919 Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Fri, 2 Aug 2024 19:24:45 +0200
Subject: [PATCH] sys-boot: upgrade Limine to 8.0.0

---
 bootstrap.d/sys-boot.yml |  4 +--
 scripts/limine.cfg       | 77 ----------------------------------------
 scripts/limine.conf      | 67 ++++++++++++++++++++++++++++++++++
 scripts/update-image.py  |  2 +-
 4 files changed, 70 insertions(+), 80 deletions(-)
 delete mode 100644 scripts/limine.cfg
 create mode 100644 scripts/limine.conf

diff --git a/bootstrap.d/sys-boot.yml b/bootstrap.d/sys-boot.yml
index 9070c88fb..e8cf02d53 100644
--- a/bootstrap.d/sys-boot.yml
+++ b/bootstrap.d/sys-boot.yml
@@ -9,8 +9,8 @@ sources:
   - name: limine
     subdir: 'ports'
     git: 'https://github.com/limine-bootloader/limine.git'
-    tag: 'v7.13.3'
-    version: '7.13.3'
+    tag: 'v8.0.0'
+    version: '8.0.0'
     tools_required:
       - host-autoconf-v2.69
       - host-automake-v1.16
diff --git a/scripts/limine.cfg b/scripts/limine.cfg
deleted file mode 100644
index a08b4a0f5..000000000
--- a/scripts/limine.cfg
+++ /dev/null
@@ -1,77 +0,0 @@
-TIMEOUT=3
-
-:managarm (Weston, e9 output, plainfb)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=bochs init.launch=weston plainfb.force=1
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
-
-:managarm (kmscon, e9 output, plainfb)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=bochs init.launch=kmscon plainfb.force=1
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
-
-:managarm (sway, e9 output, plainfb)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=bochs init.launch=sway plainfb.force=1
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
-
-:managarm (Weston, e9 output)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=bochs init.launch=weston
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
-
-:managarm (kmscon, e9 output)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=bochs init.launch=kmscon
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
-
-:Physical hardware
-
-::managarm (Weston, serial output, plainfb)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=serial init.launch=weston plainfb.force=1
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
-
-::managarm (kmscon, serial output, plainfb)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=serial init.launch=kmscon plainfb.force=1
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
-
-:Expert options
-
-::managarm (profiling, Weston, e9 output, plainfb)
-
-KERNEL_PATH=boot:///managarm/eir-mb2
-PROTOCOL=multiboot2
-CMDLINE=kernel-profile bochs init.launch=weston plainfb.force=1
-
-MODULE_PATH=boot:///managarm/thor
-MODULE_PATH=boot:///managarm/initrd.cpio
diff --git a/scripts/limine.conf b/scripts/limine.conf
new file mode 100644
index 000000000..8619faed2
--- /dev/null
+++ b/scripts/limine.conf
@@ -0,0 +1,67 @@
+timeout: 3
+
+/managarm (Weston, e9 output, plainfb)
+    kernel_path: boot():/managarm/eir-mb2
+    protocol: multiboot2
+    cmdline: bochs init.launch=weston plainfb.force=1
+
+    module_path: boot():/managarm/thor
+    module_path: boot():/managarm/initrd.cpio
+
+/managarm (kmscon, e9 output, plainfb)
+    kernel_path: boot():/managarm/eir-mb2
+    protocol: multiboot2
+    cmdline: bochs init.launch=kmscon plainfb.force=1
+
+    module_path: boot():/managarm/thor
+    module_path: boot():/managarm/initrd.cpio
+
+/managarm (sway, e9 output, plainfb)
+    kernel_path: boot():/managarm/eir-mb2
+    protocol: multiboot2
+    cmdline: bochs init.launch=sway plainfb.force=1
+
+    module_path: boot():/managarm/thor
+    module_path: boot():/managarm/initrd.cpio
+
+/managarm (Weston, e9 output)
+    kernel_path: boot():/managarm/eir-mb2
+    protocol: multiboot2
+    cmdline: bochs init.launch=weston
+
+    module_path: boot():/managarm/thor
+    module_path: boot():/managarm/initrd.cpio
+
+/managarm (kmscon, e9 output)
+    kernel_path: boot():/managarm/eir-mb2
+    protocol: multiboot2
+    cmdline: bochs init.launch=kmscon
+
+    module_path: boot():/managarm/thor
+    module_path: boot():/managarm/initrd.cpio
+
+/Physical hardware
+    //managarm (Weston, serial output, plainfb)
+        kernel_path: boot():/managarm/eir-mb2
+        protocol: multiboot2
+        cmdline: serial init.launch=weston plainfb.force=1
+
+        module_path: boot():/managarm/thor
+        module_path: boot():/managarm/initrd.cpio
+
+    //managarm (kmscon, serial output, plainfb)
+        kernel_path: boot():/managarm/eir-mb2
+        protocol: multiboot2
+        cmdline: serial init.launch=kmscon plainfb.force=1
+
+        module_path: boot():/managarm/thor
+        module_path: boot():/managarm/initrd.cpio
+
+/Expert options
+    //managarm (profiling, Weston, e9 output, plainfb)
+        kernel_path: boot():/managarm/eir-mb2
+        protocol: multiboot2
+        cmdline: kernel-profile bochs init.launch=weston plainfb.force=1
+
+        module_path: boot():/managarm/thor
+        module_path: boot():/managarm/initrd.cpio
diff --git a/scripts/update-image.py b/scripts/update-image.py
index 8e778169d..46fcf2ac4 100755
--- a/scripts/update-image.py
+++ b/scripts/update-image.py
@@ -393,7 +393,7 @@ def generate_plan(arch, root_uuid, scriptdir):
         yield FsAction.CP, "tools/host-limine/share/limine/limine-bios.sys", "boot/"
 
         yield FsAction.CP_SED, os.path.join(
-            scriptdir, "limine.cfg"
+            scriptdir, "limine.conf"
         ), "boot/", "@ROOT_UUID@", root_uuid
 
     yield FsAction.RSYNC, "bin"