From ddb93aa4afa7bac4d2723ddcaab3abea312220f7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 16 Mar 2019 14:31:33 -0600 Subject: [PATCH] Update EFI image creation --- bootloader-efi | 2 +- mk/disk.mk | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/bootloader-efi b/bootloader-efi index 69f7e69..8672aa6 160000 --- a/bootloader-efi +++ b/bootloader-efi @@ -1 +1 @@ -Subproject commit 69f7e6923e34f2d5ddd26f69226b487e2ec09c1c +Subproject commit 8672aa616d2c1fb096ba02f1e0543ca39665a972 diff --git a/mk/disk.mk b/mk/disk.mk index ef1d062..4e82b00 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -33,30 +33,25 @@ build/coreboot.elf: bootloader-coreboot/build/bootloader bootloader-efi/build/redox_bootloader/boot.efi: $(MAKE) -C bootloader-efi build/redox_bootloader/boot.efi -build/bootloader.efi: bootloader-efi/build/redox_bootloader/boot.efi - cp $< $@ - -build/harddrive-efi.bin: build/bootloader.efi build/filesystem.bin +build/harddrive-efi.bin: bootloader-efi/build/x86_64-efi-pe/boot.efi build/filesystem.bin dd if=/dev/zero of=$@.partial bs=1048576 count=4 mkfs.vfat $@.partial mmd -i $@.partial efi mmd -i $@.partial efi/boot mcopy -i $@.partial $< ::efi/boot/bootx64.efi mmd -i $@.partial redox_bootloader - mcopy -i $@.partial -s bootloader-efi/res ::redox_bootloader cat $@.partial build/filesystem.bin > $@ build/harddrive-efi.bin.gz: build/harddrive-efi.bin gzip -k -f $< -build/livedisk-efi.iso: build/bootloader.efi build/kernel_live +build/livedisk-efi.iso: bootloader-efi/build/x86_64-efi-pe/boot.efi build/kernel_live dd if=/dev/zero of=$@.partial bs=1048576 count=272 mkfs.vfat $@.partial mmd -i $@.partial efi mmd -i $@.partial efi/boot mcopy -i $@.partial $< ::efi/boot/bootx64.efi mmd -i $@.partial redox_bootloader - mcopy -i $@.partial -s bootloader-efi/res ::redox_bootloader mcopy -i $@.partial -s build/kernel_live ::redox_bootloader/kernel mv $@.partial $@