diff --git a/Makefile b/Makefile index d0cc2af9..5cac50f3 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,10 @@ jinx: iso: $(ISO) -$(ISO): limine.cfg liminebg.bmp $(KERNEL) $(INITRD)-$(DISTROTYPE) +$(ISO): limine.conf liminebg.bmp $(KERNEL) $(INITRD)-$(DISTROTYPE) mkdir -p $(ISODIR) ln -f $(INITRD)-$(DISTROTYPE) $(ISODIR)/initrd - cp $(KERNEL) liminebg.bmp limine.cfg $(LIMINEDIR)/limine-bios.sys $(LIMINEDIR)/limine-bios-cd.bin $(LIMINEDIR)/limine-uefi-cd.bin $(ISODIR) + cp $(KERNEL) liminebg.bmp limine.conf $(LIMINEDIR)/limine-bios.sys $(LIMINEDIR)/limine-bios-cd.bin $(LIMINEDIR)/limine-uefi-cd.bin $(ISODIR) xorriso -as mkisofs -b limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label $(ISODIR) -o $(ISO) # ------ build targets ------ diff --git a/limine.cfg b/limine.cfg deleted file mode 100644 index 9af2c390..00000000 --- a/limine.cfg +++ /dev/null @@ -1,30 +0,0 @@ -TERM_MARGIN=40 -TERM_MARGIN_GRADIENT=40 -TERM_WALLPAPER=boot:///liminebg.bmp -TERM_WALLPAPER_STYLE=stretched -TIMEOUT=5 - -:Astral (X.org, nvme0n1, ext2) -PROTOCOL=limine -KERNEL_PATH=boot:///astral -KERNEL_CMDLINE=rootfs=ext2 root=nvme0n1 initarg=withx nosmp -COMMENT="The Astral operating system" - -:Astral (login prompt, nvme0n1, ext2) -PROTOCOL=limine -KERNEL_PATH=boot:///astral -KERNEL_CMDLINE=rootfs=ext2 root=nvme0n1 initarg=withlogin nosmp -COMMENT="The Astral operating system" - -:Astral (root shell, nvme0n1, ext2) -PROTOCOL=limine -KERNEL_PATH=boot:///astral -KERNEL_CMDLINE=rootfs=ext2 root=nvme0n1 nosmp -COMMENT="The Astral operating system" - -:Astral (root shell, initrd) -PROTOCOL=limine -KERNEL_PATH=boot:///astral -MODULE_PATH=boot:///initrd -KERNEL_CMDLINE=initrd rootfs=tmpfs nosmp -COMMENT="The Astral operating system" diff --git a/limine.conf b/limine.conf new file mode 100644 index 00000000..a11f0491 --- /dev/null +++ b/limine.conf @@ -0,0 +1,30 @@ +TERM_MARGIN: 40 +TERM_MARGIN_GRADIENT: 40 +WALLPAPER: boot():/liminebg.bmp +WALLPAPER_STYLE: stretched +TIMEOUT: 5 + +/Astral (X.org, nvme0n1, ext2) +PROTOCOL: limine +KERNEL_PATH: boot():/astral +KERNEL_CMDLINE: rootfs=ext2 root=nvme0n1 initarg=withx nosmp +COMMENT: "The Astral operating system" + +/Astral (login prompt, nvme0n1, ext2) +PROTOCOL: limine +KERNEL_PATH: boot():/astral +KERNEL_CMDLINE: rootfs=ext2 root=nvme0n1 initarg=withlogin nosmp +COMMENT: "The Astral operating system" + +/Astral (root shell, nvme0n1, ext2) +PROTOCOL: limine +KERNEL_PATH: boot():/astral +KERNEL_CMDLINE: rootfs=ext2 root=nvme0n1 nosmp +COMMENT: "The Astral operating system" + +/Astral (root shell, initrd) +PROTOCOL: limine +KERNEL_PATH: boot():/astral +MODULE_PATH: boot():/initrd +KERNEL_CMDLINE: initrd rootfs=tmpfs nosmp +COMMENT: "The Astral operating system" diff --git a/source-recipes/limine b/source-recipes/limine index 874a2ffa..95a57814 100644 --- a/source-recipes/limine +++ b/source-recipes/limine @@ -1,8 +1,8 @@ name=limine -version=7.3.0 +version=8.0.9 source_method=tarball tarball_url="https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz" -tarball_sha512="fc25375f86c18ae991f6f6d11fa127b47d1fdfa81059ed663a82202f9de95b9774516e1bf5a648abaedde8e04fe004c296666b6ec3a1eeaf5cf3472aca87c0c5" +tarball_sha512="79baca17ad895ae8655b9935206f065d0c89f350240cd507af0cdd14e4e71aa71e8ba45ebf368218ce7e8de4bec2fa6012b863e1ffd86fdc66c15e39663f7f80" hostdeps="autoconf automake libtool pkgconfig" regenerate() {