summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlendi <slendi@socopon.com>2023-09-27 22:20:04 +0300
committerSlendi <slendi@socopon.com>2023-09-27 22:20:54 +0300
commita1d043c28b11654535d9f2f4523197e0d8ff461a (patch)
treeb78e1f3ce443e481f02f06dd2a6cc57ed4b9484a
parent2b8ee7296e999f1d3def5a68d45bcc4fc27860b3 (diff)
Simplify build.sh and run.sh to not use a disk image.
Signed-off-by: Slendi <slendi@socopon.com>
-rwxr-xr-xbuild.sh31
-rwxr-xr-xrun.sh2
2 files changed, 17 insertions, 16 deletions
diff --git a/build.sh b/build.sh
index b67056d..273656c 100755
--- a/build.sh
+++ b/build.sh
@@ -6,19 +6,20 @@ set -xe
odin build . -lld -target:windows_amd64 -no-crt -disable-red-zone -no-entry-point -no-thread-local -build-mode:dll -out:BOOTX64.obj
clang -target x86_64-unknown-windows -nostdlib -Wl,-entry:efi_main -Wl,-subsystem:efi_application -fuse-ld=lld-link -o BOOTX64.EFI BOOTX64.obj stub.c
-rm -rf "$img_file"
-qemu-img create "$img_file" 2G
-parted "$img_file" mklabel gpt
-parted "$img_file" mkpart primary fat32 1MiB "$efi_partition_size"
-parted "$img_file" set 1 esp on
-parted "$img_file" print
-sudo modprobe nbd max_part=16
-sudo qemu-nbd --format=raw -c /dev/nbd0 "$img_file"
-sudo mkdir -p /tmp/efi
-sudo mkfs.fat -F32 /dev/nbd0p1
-sudo mount /dev/nbd0p1 /tmp/efi
-sudo mkdir -p /tmp/efi/EFI/BOOT
-sudo cp BOOTX64.EFI /tmp/efi/EFI/BOOT/
-sudo umount /tmp/efi
-sudo qemu-nbd -d /dev/nbd0
+##### Use this if you want to create a hard disk image #####
+#rm -rf "$img_file"
+#qemu-img create "$img_file" 2G
+#parted "$img_file" mklabel gpt
+#parted "$img_file" mkpart primary fat32 1MiB "$efi_partition_size"
+#parted "$img_file" set 1 esp on
+#parted "$img_file" print
+#sudo modprobe nbd max_part=16
+#sudo qemu-nbd --format=raw -c /dev/nbd0 "$img_file"
+#sudo mkdir -p /tmp/efi
+#sudo mkfs.fat -F32 /dev/nbd0p1
+#sudo mount /dev/nbd0p1 /tmp/efi
+#sudo mkdir -p /tmp/efi/EFI/BOOT
+#sudo cp BOOTX64.EFI /tmp/efi/EFI/BOOT/
+#sudo umount /tmp/efi
+#sudo qemu-nbd -d /dev/nbd0
set -x
diff --git a/run.sh b/run.sh
index 5838701..2f9feeb 100755
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-qemu-system-x86_64 -drive format=raw,file=disk.img -m 4G -smp 4 -M q35,kernel-irqchip=split -device intel-iommu,intremap=on -bios /usr/share/edk2/x64/OVMF.fd -vga std $@
+qemu-system-x86_64 -m 4G -smp 4 -M q35,kernel-irqchip=split -device intel-iommu,intremap=on -bios /usr/share/edk2/x64/OVMF.fd -vga std -kernel BOOTX64.EFI $@