diff options
| author | Julia Hansbrough <flowerhack@google.com> | 2018-08-14 17:28:57 -0700 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-08-17 07:02:12 -0700 |
| commit | 738da825b2984a0522cbf2d868307dedd5354b2d (patch) | |
| tree | 66bb9b3245243280628e43e59c7ae2e97a3b4d71 /pkg | |
| parent | f22e81b50080de7c5ea503f1cead16ed85a16f79 (diff) | |
[fuchsia] Change QEMU args to use multiboot shim.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/fuchsia.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index d2cf52370..c1f5a1753 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -26,11 +26,11 @@ func (fu fuchsia) build(targetArch, vmType, kernelDir, outputDir, compiler, user return err } for src, dst := range map[string]string{ - "out/" + arch + "/images/fvm.blk": "image", - "out/" + arch + "/ssh-keys/id_ed25519": "key", - "out/build-zircon/build-" + arch + "/zircon.elf": "obj/zircon.elf", - "out/build-zircon/build-" + arch + "/zircon.bin": "kernel", - "out/" + arch + "/bootdata-blob-pc.bin": "initrd", + "out/" + arch + "/images/fvm.blk": "image", + "out/" + arch + "/ssh-keys/id_ed25519": "key", + "out/build-zircon/build-" + arch + "/zircon.elf": "obj/zircon.elf", + "out/build-zircon/build-" + arch + "/multiboot.bin": "kernel", + "out/" + arch + "/fuchsia.zbi": "initrd", } { fullSrc := filepath.Join(kernelDir, filepath.FromSlash(src)) fullDst := filepath.Join(outputDir, filepath.FromSlash(dst)) |