From 608adb576726c2ab12fd0a1583d58381e5584e97 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 6 Aug 2023 03:27:05 +0200
Subject: [PATCH 1/4] Dynamically find an unused loop device

loop0 may very well already be used. Fix uefi.sh to find loop device
dynamically.
---
 util/uefi.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/util/uefi.sh b/util/uefi.sh
index 203290f..01752bd 100755
--- a/util/uefi.sh
+++ b/util/uefi.sh
@@ -13,17 +13,18 @@ set -e
 util/uefi_compile.sh
 
 mkdir -p mount
-sudo losetup --offset `fdisk -l bin/uefi_drive | grep 'EFI System' | awk '{print 512*$2}'` --sizelimit `fdisk -l bin/uefi_drive | grep 'EFI System' | awk '{print 512*$4}'` /dev/loop0 bin/uefi_drive
-# sudo mkfs.fat /dev/loop0
-sudo mount /dev/loop0 mount
+LODEV=$(losetup -f)
+sudo losetup --offset `fdisk -l bin/uefi_drive | grep 'EFI System' | awk '{print 512*$2}'` --sizelimit `fdisk -l bin/uefi_drive | grep 'EFI System' | awk '{print 512*$4}'` $LODEV bin/uefi_drive
+# sudo mkfs.fat $LODEV
+sudo mount $LODEV mount
 sudo mkdir -p mount/EFI/BOOT
 sudo cp bin/uefi mount/EFI/BOOT/BOOTX64.EFI
 sudo cp bin/uefi mount/es.efi
 sudo cp bin/Kernel.esx mount/eskernel.esx
 sudo cp bin/uefi_loader mount/esloader.bin
 sudo cp bin/iid.dat mount/esiid.dat
-sudo umount /dev/loop0
-sudo losetup --detach /dev/loop0
+sudo umount $LODEV
+sudo losetup --detach $LODEV
 rmdir mount
 
 dd if=bin/drive of=bin/uefi_drive bs=512 count=`fdisk -l bin/drive | grep 'Linux' | awk '{print $5}'` skip=`fdisk -l bin/drive | grep 'Linux' | awk '{print $3}'` seek=`fdisk -l bin/uefi_drive | grep 'Linux filesystem' | awk '{print $2}'` conv=notrunc

From 336e8481db58995f10285e429ecb80937fdd6cac Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 6 Aug 2023 03:29:11 +0200
Subject: [PATCH 2/4] Fix path to Kernel.esx

---
 util/uefi.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/uefi.sh b/util/uefi.sh
index 01752bd..0974316 100755
--- a/util/uefi.sh
+++ b/util/uefi.sh
@@ -20,7 +20,7 @@ sudo mount $LODEV mount
 sudo mkdir -p mount/EFI/BOOT
 sudo cp bin/uefi mount/EFI/BOOT/BOOTX64.EFI
 sudo cp bin/uefi mount/es.efi
-sudo cp bin/Kernel.esx mount/eskernel.esx
+sudo cp ./root/Essence/Kernel.esx mount/eskernel.esx
 sudo cp bin/uefi_loader mount/esloader.bin
 sudo cp bin/iid.dat mount/esiid.dat
 sudo umount $LODEV

From 4d20edcbb0e305efd7dd5bc811080081f0ec0c94 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 6 Aug 2023 03:30:18 +0200
Subject: [PATCH 3/4] uefi.sh: Uncomment running qemu

---
 util/uefi.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/uefi.sh b/util/uefi.sh
index 0974316..b28338f 100755
--- a/util/uefi.sh
+++ b/util/uefi.sh
@@ -29,4 +29,4 @@ rmdir mount
 
 dd if=bin/drive of=bin/uefi_drive bs=512 count=`fdisk -l bin/drive | grep 'Linux' | awk '{print $5}'` skip=`fdisk -l bin/drive | grep 'Linux' | awk '{print $3}'` seek=`fdisk -l bin/uefi_drive | grep 'Linux filesystem' | awk '{print $2}'` conv=notrunc
 
-# qemu-system-x86_64 -bios /usr/share/ovmf/x64/OVMF.fd -drive file=bin/uefi_drive,format=raw,media=disk,index=0 -s -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0,id=mykeyboard -device usb-mouse,bus=xhci.0,id=mymouse
+qemu-system-x86_64 -bios OVMF.fd -drive file=bin/uefi_drive,format=raw,media=disk,index=0 -s -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0,id=mykeyboard -device usb-mouse,bus=xhci.0,id=mymouse

From 4653876ade8e396d5041e711800b6a5137fe6492 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 6 Aug 2023 03:32:19 +0200
Subject: [PATCH 4/4] Format EFI system partition

---
 util/uefi.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/uefi.sh b/util/uefi.sh
index b28338f..170ac07 100755
--- a/util/uefi.sh
+++ b/util/uefi.sh
@@ -15,7 +15,7 @@ util/uefi_compile.sh
 mkdir -p mount
 LODEV=$(losetup -f)
 sudo losetup --offset `fdisk -l bin/uefi_drive | grep 'EFI System' | awk '{print 512*$2}'` --sizelimit `fdisk -l bin/uefi_drive | grep 'EFI System' | awk '{print 512*$4}'` $LODEV bin/uefi_drive
-# sudo mkfs.fat $LODEV
+sudo mkfs.fat $LODEV
 sudo mount $LODEV mount
 sudo mkdir -p mount/EFI/BOOT
 sudo cp bin/uefi mount/EFI/BOOT/BOOTX64.EFI