From d68a24f8490ea1a793116a8580e072e9a49d2b1a Mon Sep 17 00:00:00 2001 From: mintsuki Date: Tue, 20 Jun 2023 17:55:01 +0200 Subject: [PATCH] Update --- GNUmakefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index a5d5fc8..1f2d1bb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -30,7 +30,7 @@ ovmf: cd ovmf && curl -Lo OVMF-X64.zip https://efi.akeo.ie/OVMF/OVMF-X64.zip && unzip OVMF-X64.zip limine: - git clone https://github.com/limine-bootloader/limine.git --branch=v4.x-branch-binary --depth=1 + git clone https://github.com/limine-bootloader/limine.git --branch=v5.x-branch-binary --depth=1 $(MAKE) -C limine .PHONY: kernel @@ -41,15 +41,15 @@ $(IMAGE_NAME).iso: limine kernel rm -rf iso_root mkdir -p iso_root cp kernel/kernel.elf \ - limine.cfg limine/limine.sys limine/limine-cd.bin limine/limine-cd-efi.bin iso_root/ + limine.cfg limine/limine-bios.sys limine/limine-bios-cd.bin limine/limine-uefi-cd.bin iso_root/ mkdir -p iso_root/EFI/BOOT cp limine/BOOT*.EFI iso_root/EFI/BOOT/ - xorriso -as mkisofs -b limine-cd.bin \ + xorriso -as mkisofs -b limine-bios-cd.bin \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - --efi-boot limine-cd-efi.bin \ + --efi-boot limine-uefi-cd.bin \ -efi-boot-part --efi-boot-image --protective-msdos-label \ iso_root -o $(IMAGE_NAME).iso - limine/limine-deploy $(IMAGE_NAME).iso + ./limine/limine bios-install $(IMAGE_NAME).iso rm -rf iso_root $(IMAGE_NAME).hdd: limine kernel @@ -58,13 +58,13 @@ $(IMAGE_NAME).hdd: limine kernel parted -s $(IMAGE_NAME).hdd mklabel gpt parted -s $(IMAGE_NAME).hdd mkpart ESP fat32 2048s 100% parted -s $(IMAGE_NAME).hdd set 1 esp on - limine/limine-deploy $(IMAGE_NAME).hdd + ./limine/limine bios-install $(IMAGE_NAME).hdd sudo losetup -Pf --show $(IMAGE_NAME).hdd >loopback_dev sudo mkfs.fat -F 32 `cat loopback_dev`p1 mkdir -p img_mount sudo mount `cat loopback_dev`p1 img_mount sudo mkdir -p img_mount/EFI/BOOT - sudo cp -v kernel/kernel.elf limine.cfg limine/limine.sys img_mount/ + sudo cp -v kernel/kernel.elf limine.cfg limine/limine-bios.sys img_mount/ sudo cp -v limine/BOOT*.EFI img_mount/EFI/BOOT/ sync sudo umount img_mount