Begin prototyping limine UEFI ISO generation.

build/build-temp-vm-uefi-iso.sh

@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Build OS using AUTO.ISO minimal auto-install as bootstrap to merge codebase, recompile system, attempt build limine UEFI hybrid ISO
+
+# make sure we are in the correct directory
+SCRIPT_DIR=$(realpath "$(dirname "$0")")
+SCRIPT_NAME=$(basename "$0")
+EXPECTED_DIR=$(realpath "$PWD")
+
+if test "${EXPECTED_DIR}" != "${SCRIPT_DIR}"
+then
+	( cd "$SCRIPT_DIR" || exit ; "./$SCRIPT_NAME" "$@" );
+	exit
+fi
+
+# Uncomment if you use doas instead of sudo
+#alias sudo=doas 
+
+TMPDIR="/tmp/zealtmp"
+TMPISODIR="$TMPDIR/iso"
+TMPDISK="$TMPDIR/ZealOS.raw"
+TMPMOUNT="$TMPDIR/mnt"
+
+mount_tempdisk() {
+	sudo modprobe nbd
+	sudo qemu-nbd -c /dev/nbd0 -f raw $TMPDISK
+	sudo partprobe /dev/nbd0
+	sudo mount /dev/nbd0p1 $TMPMOUNT
+}
+
+umount_tempdisk() {
+	sync
+	sudo umount $TMPMOUNT
+	sudo qemu-nbd -d /dev/nbd0
+}
+
+[ ! -d $TMPMOUNT ] && mkdir -p $TMPMOUNT
+[ ! -d $TMPISODIR ] && mkdir -p $TMPISODIR
+
+set -e
+
+echo "Building ZealBooter..."
+( cd ../zealbooter && make clean all )
+
+set +e
+
+echo "Making temp vdisk, running auto-install..."
+qemu-img create -f raw $TMPDISK 192M
+qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -cdrom AUTO-VM-1.ISO -device isa-debug-exit
+
+if [ ! -d "limine" ]; then
+    echo "Downloading limine bootloader..."
+    git clone https://github.com/limine-bootloader/limine.git --branch=v3.0-branch-binary --depth=1
+    make -C limine
+fi
+
+echo "Mounting vdisk and copying src/..."
+rm ../src/Home/Registry.ZC 2> /dev/null
+rm ../src/Home/MakeHome.ZC 2> /dev/null
+
+mount_tempdisk
+sudo cp -r ../src/* $TMPMOUNT
+sudo mkdir -p $TMPMOUNT/EFI/BOOT
+sudo cp limine/BOOTX64.EFI $TMPMOUNT/EFI/BOOT/BOOTX64.EFI
+sudo cp limine/limine.sys $TMPMOUNT/
+sudo cp ../zealbooter/zealbooter.elf $TMPMOUNT/Boot/ZealBooter.ELF
+umount_tempdisk
+
+echo "Rebuilding kernel..."
+qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -device isa-debug-exit
+
+mount_tempdisk
+sudo cp -r $TMPMOUNT $TMPISODIR
+sudo cp limine/limine-cd-efi.bin $TMPISODIR/
+sudo cp limine/limine-cd.bin $TMPISODIR/
+sudo cp limine/limine.sys $TMPISODIR/
+sudo cp $TMPMOUNT/limine.cfg $TMPISODIR/limine.cfg
+sudo cp ../zealbooter/zealbooter.elf $TMPISODIR/Boot/ZealBooter.ELF
+umount_tempdisk
+
+xorriso -as mkisofs -b limine-cd.bin \
+        -no-emul-boot -boot-load-size 4 -boot-info-table \
+        --efi-boot limine-cd-efi.bin \
+        -efi-boot-part --efi-boot-image --protective-msdos-label \
+        $TMPISODIR -o ZealOS-UEFI-limine-dev.iso
+
+./limine/limine-deploy ZealOS-UEFI-limine-dev.iso
+
+if [ ! -d "ovmf" ]; then
+    echo "Downloading OVMF..."
+    mkdir ovmf
+    cd ovmf
+    curl -o OVMF-X64.zip https://efi.akeo.ie/OVMF/OVMF-X64.zip
+    7z x OVMF-X64.zip
+    cd ..
+fi
+
+echo "Testing UEFI ISO boot ..."
+#qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -bios ovmf/OVMF.fd -smp 4 -cdrom ZealOS-UEFI-limine-dev.iso
+qemu-system-x86_64 -machine q35,accel=kvm -m 1G -rtc base=localtime -bios ovmf/OVMF.fd -smp 4 -cdrom ZealOS-UEFI-limine-dev.iso
+
+echo "Deleting temp folder..."
+sudo rm -rf $TMPDIR
+echo "Finished."
+

src/Kernel/KernelA.HH

@@ -584,7 +584,7 @@ class CKernel
 	;$$ = ($$ + 15) & -16;
 	CGDT			sys_gdt;
 	U32				sys_font_ptr;
-	CLimineFramebuffer limine_framebuffer;
+//	CLimineFramebuffer limine_framebuffer;
 	CVBEInfo		sys_vbe_info;
 	CVBEModeShort	sys_vbe_modes[VBE_MODES_NUM];
 	CVBEMode		sys_vbe_mode;