vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Always use live disk for aarch64

Browse source
This commit is contained in:
Jeremy Soller 2022-08-26 11:30:14 -06:00
parent 603d97d7b0
commit 231d10a83c
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mk/disk.mk
View file

@ -59,7 +59,7 @@ build/livedisk-efi.bin: build/bootloader-live.efi build/filesystem.bin
mkfs.vfat $@.esp && \ mkfs.vfat $@.esp && \
mmd -i $@.esp efi && \ mmd -i $@.esp efi && \
mmd -i $@.esp efi/boot && \ mmd -i $@.esp efi/boot && \
mcopy -i $@.esp $< ::efi/boot/bootx64.efi && \ mcopy -i $@.esp $< ::$(BOOTLOADER_EFI_PATH) && \
# Create the disk \ # Create the disk \
dd if=/dev/zero of=$@ bs=1048576 count=$$(expr $$(du -m $< | cut -f1) + 2 + $$(du -m build/filesystem.bin | cut -f1)) && \ dd if=/dev/zero of=$@ bs=1048576 count=$$(expr $$(du -m $< | cut -f1) + 2 + $$(du -m build/filesystem.bin | cut -f1)) && \
# Create partition table \ # Create partition table \

1
mk/qemu.mk
View file

@ -13,6 +13,7 @@ else ifeq ($(ARCH),x86_64)
else ifeq ($(ARCH),aarch64) else ifeq ($(ARCH),aarch64)
efi=yes efi=yes
kvm=no kvm=no
live=yes
#TODO: support vga #TODO: support vga
vga=no vga=no
QEMU_ARCH=aarch64 QEMU_ARCH=aarch64