MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the build dir as tftproot and build a suitable tftproot when building the live disk

Browse Source
This commit is contained in:
bjorn3 2025-06-22 20:23:28 +02:00
parent d2fde06fd1
commit fb64e5e9b8
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -13,12 +13,6 @@ live:
rm -f $(BUILD)/redox-live.iso rm -f $(BUILD)/redox-live.iso
$(MAKE) $(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: $(BUILD)/redox-live.iso
popsicle-gtk $(BUILD)/redox-live.iso popsicle-gtk $(BUILD)/redox-live.iso

10
mk/disk.mk
View File

@ -12,7 +12,7 @@ $(BUILD)/harddrive.img: $(HOST_FSTOOLS) $(REPO_TAG)
umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $@.partial umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $@.partial
mv $@.partial $@ mv $@.partial $@
$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) redox.ipxe
mkdir -p $(BUILD) mkdir -p $(BUILD)
rm -rf $@ $@.partial rm -rf $@ $@.partial
-$(FUMOUNT) /tmp/redox_installer || true -$(FUMOUNT) /tmp/redox_installer || true
@ -23,13 +23,7 @@ $(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG)
truncate -s "$$FILESYSTEM_SIZE"m $@.partial truncate -s "$$FILESYSTEM_SIZE"m $@.partial
umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial
mv $@.partial $@ mv $@.partial $@
cp redox.ipxe $(BUILD)/redox.ipxe
$(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
$(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG)
mkdir -p $(BUILD) mkdir -p $(BUILD)

6
mk/qemu.mk
View File

@ -151,7 +151,7 @@ else
EXTRANETARGS= EXTRANETARGS=
ifeq ($(netboot),yes) ifeq ($(netboot),yes)
EXTRANETARGS+=,tftp=$(BUILD)/tftproot,bootfile=redox.ipxe EXTRANETARGS+=,tftp=$(BUILD),bootfile=redox.ipxe
endif endif
ifneq ($(bridge),) ifneq ($(bridge),)
@ -242,10 +242,6 @@ qemu-deps:$(FIRMWARE)
qemu-deps:$(QEMU_KERNEL) qemu-deps:$(QEMU_KERNEL)
ifeq ($(netboot),yes)
qemu-deps: $(BUILD)/tftproot
endif
qemu-deps: $(PFLASH0) qemu-deps: $(PFLASH0)
ifneq ($(PFLASH1),) ifneq ($(PFLASH1),)