From 21711670544d3c8b852e978565081b8bb34f68c6 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Tue, 23 Sep 2025 00:22:39 -0400 Subject: build: Use iso_root/ for iso generation Signed-off-by: Ian Moffett --- .gitignore | 1 + src/Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index db5f842..844ddb4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /src/sys/l5 /src/sys/target /src/sys/os/amd64 +/src/iso_root *.o *.d *.iso diff --git a/src/Makefile b/src/Makefile index ebfd906..ef157eb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -44,14 +44,14 @@ root: .PHONY: sysroot image: + mkdir -p iso_root/boot/ + cp data/boot/limine.conf $(SHIMDIR)/limine/limine-bios.sys \ + $(SHIMDIR)/limine/limine-bios-cd.bin $(SHIMDIR)/limine/limine-uefi-cd.bin iso_root/ $(OMAR) -i $(SYSROOT) -o $(SYSROOT)/boot/initrd.omar - cp $(SHIMDIR)/limine/limine-bios-cd.bin $(SYSROOT)/ - cp $(SHIMDIR)/limine/limine-uefi-cd.bin $(SYSROOT)/ - cp $(SHIMDIR)/limine/limine-bios.sys $(SYSROOT)/ - cp -rf data/boot/* $(SYSROOT)/boot/ + cp sys/l5 iso_root/boot/ 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 $(SYSROOT) -o $(ISO) 1>/dev/null + --efi-boot-image --protective-msdos-label iso_root/ -o $(ISO) 1>/dev/null $(SHIMDIR)/limine/limine bios-install $(ISO) 1>/dev/null -- cgit v1.2.3