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

Fix running qemu_live, update kernel

Browse source
This commit is contained in:
Jeremy Soller 2018-12-02 19:26:16 -07:00
parent 9ec6b43a65
commit 9d4a2650eb
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel

@ -1 +1 @@
Subproject commit 69e3fe105df62f28a99d1a850f342ea69c6623d3 Subproject commit ecc0e747fc703a1b95b4e0cdb194defd443cafd6

12
mk/qemu.mk
View file

@ -66,22 +66,22 @@ qemu_efi_no_build: build/extra.qcow2
qemu_nvme: build/harddrive.bin build/extra.qcow2 qemu_nvme: build/harddrive.bin build/extra.qcow2
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive.bin,format=raw -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ -drive file=build/harddrive.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL
qemu_nvme_no_build: build/extra.qcow2 qemu_nvme_no_build: build/extra.qcow2
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=build/harddrive.bin,format=raw -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ -drive file=build/harddrive.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.qcow2,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL
qemu_live: build/livedisk.bin build/extra.qcow2 qemu_live: build/livedisk.bin build/extra.qcow2
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-device usb-ehci,id=flash_bus -drive id=flash_drive,file=build/livedisk.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 \ -drive file=build/livedisk.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.qcow2
qemu_live_no_build: build/extra.qcow2 qemu_live_no_build: build/extra.qcow2
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-device usb-ehci,id=flash_bus -drive id=flash_drive,file=build/livedisk.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 \ -drive file=build/livedisk.bin,format=raw \
-drive file=build/extra.qcow2 -drive file=build/extra.qcow2
qemu_iso: build/livedisk.iso build/extra.qcow2 qemu_iso: build/livedisk.iso build/extra.qcow2