mara/redox
Watch
0
0
Fork
You've already forked redox
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix disk creation on i686

Browse source
This commit is contained in:
Jeremy Soller 2022-08-28 15:40:01 -06:00
commit fd45421a30
1 changed files with 56 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mk/disk.mk
View file

@ -1,8 +1,22 @@
build/harddrive.bin: build/bootloader.efi build/filesystem.bin $(BOOTLOADER_BIOS)
env PARTED=$(PARTED) ./mk/disk.sh $@ build/filesystem.bin $< $(BOOTLOADER_EFI_PATH) $(BOOTLOADER_BIOS)
build/harddrive.bin: build/filesystem.bin $(BOOTLOADER_EFI) $(BOOTLOADER_BIOS)
rm -f $@ $@.partial
env \
PARTED=$(PARTED) \
BOOTLOADER_EFI=$(BOOTLOADER_EFI) \
BOOTLOADER_EFI_PATH=$(BOOTLOADER_EFI_PATH) \
BOOTLOADER_BIOS=$(BOOTLOADER_BIOS) \
./mk/disk.sh $@.partial $<
mv "$@.partial" "$@"
build/livedisk.bin: build/bootloader-live.efi build/filesystem.bin $(BOOTLOADER_BIOS_LIVE)
env PARTED=$(PARTED) ./mk/disk.sh $@ build/filesystem.bin $< $(BOOTLOADER_EFI_PATH) $(BOOTLOADER_BIOS_LIVE)
build/livedisk.bin: build/filesystem.bin $(BOOTLOADER_EFI_LIVE) $(BOOTLOADER_BIOS_LIVE)
rm -f $@ $@.partial
env \
PARTED=$(PARTED) \
BOOTLOADER_EFI=$(BOOTLOADER_EFI_LIVE) \
BOOTLOADER_EFI_PATH=$(BOOTLOADER_EFI_PATH) \
BOOTLOADER_BIOS=$(BOOTLOADER_BIOS_LIVE) \
./mk/disk.sh $@.partial $<
mv "$@.partial" "$@"
build/livedisk.iso: build/livedisk.bin.gz
rm -rf build/iso/