From fb64e5e9b85c5c217355fb5a5d65b6c272a95356 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 22 Jun 2025 20:23:28 +0200
Subject: [PATCH] Use the build dir as tftproot and build a suitable tftproot
 when building the live disk

---
 Makefile   |  6 ------
 mk/disk.mk | 10 ++--------
 mk/qemu.mk |  6 +-----
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 5e323480..cbc345cb 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,6 @@ live:
 	rm -f $(BUILD)/redox-live.iso
 	$(MAKE) $(BUILD)/redox-live.iso
 
-netboot:
-	-$(FUMOUNT) $(BUILD)/filesystem/ || true
-	-$(FUMOUNT) /tmp/redox_installer/ || true
-	rm -rf $(BUILD)/redox-live.iso $(BUILD)/tftproot
-	$(MAKE) $(BUILD)/tftproot
-
 popsicle: $(BUILD)/redox-live.iso
 	popsicle-gtk $(BUILD)/redox-live.iso
 
diff --git a/mk/disk.mk b/mk/disk.mk
index a3c64a39..c26d9a6c 100644
--- a/mk/disk.mk
+++ b/mk/disk.mk
@@ -12,7 +12,7 @@ $(BUILD)/harddrive.img: $(HOST_FSTOOLS) $(REPO_TAG)
 	umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $@.partial
 	mv $@.partial $@
 
-$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG)
+$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) redox.ipxe
 	mkdir -p $(BUILD)
 	rm -rf $@  $@.partial
 	-$(FUMOUNT) /tmp/redox_installer || true
@@ -23,13 +23,7 @@ $(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG)
 	truncate -s "$$FILESYSTEM_SIZE"m $@.partial
 	umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial
 	mv $@.partial $@
-
-$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/redox-live.iso
-	rm -r $(BUILD)/tftproot || true
-	mkdir $(BUILD)/tftproot
-	cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi
-	ln -s ../redox-live.iso $(BUILD)/tftproot/redox-live.iso
-	cp redox.ipxe $(BUILD)/tftproot/redox.ipxe
+	cp redox.ipxe $(BUILD)/redox.ipxe
 
 $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG)
 	mkdir -p $(BUILD)
diff --git a/mk/qemu.mk b/mk/qemu.mk
index 14eef958..6036d0fc 100644
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@@ -151,7 +151,7 @@ else
 
 	EXTRANETARGS=
 	ifeq ($(netboot),yes)
-		EXTRANETARGS+=,tftp=$(BUILD)/tftproot,bootfile=redox.ipxe
+		EXTRANETARGS+=,tftp=$(BUILD),bootfile=redox.ipxe
 	endif
 
 	ifneq ($(bridge),)
@@ -242,10 +242,6 @@ qemu-deps:$(FIRMWARE)
 
 qemu-deps:$(QEMU_KERNEL)
 
-ifeq ($(netboot),yes)
-qemu-deps: $(BUILD)/tftproot
-endif
-
 qemu-deps: $(PFLASH0)
 
 ifneq ($(PFLASH1),)