diff options
| author | Marco Vanotti <mvanotti@google.com> | 2020-09-28 19:04:08 -0700 |
|---|---|---|
| committer | Marco Vanotti <mvanotti@users.noreply.github.com> | 2020-10-01 12:43:24 -0700 |
| commit | a8385ddb95a403cd473f7aad14de6bbfad277115 (patch) | |
| tree | 98be08cabbe2bd4a2b69c42b250624f621282012 /pkg | |
| parent | f39459168a2398198ea456b6e1bd76749f3a4021 (diff) | |
pkg/build/fuchsia: fix zbi and multiboot paths
Recently some files in fuchsia moved around. This commit makes them use
the right path.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/fuchsia.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index 6b811c6f5..b4150f27b 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -57,7 +57,7 @@ func (fu fuchsia) build(params *Params) error { kernelZBI := filepath.Join(params.KernelDir, "out", arch, "fuchsia.zbi") authorizedKeys := fmt.Sprintf("data/ssh/authorized_keys=%s", filepath.Join(params.KernelDir, ".ssh", "authorized_keys")) - if _, err := runSandboxed(time.Minute, params.KernelDir, "out/"+arch+".zircon/tools/zbi", + if _, err := runSandboxed(time.Minute, params.KernelDir, "out/"+arch+"/host_x64/zbi", "-o", sshZBI, kernelZBI, "--entry", authorizedKeys); err != nil { return err } @@ -66,7 +66,7 @@ func (fu fuchsia) build(params *Params) error { "out/" + arch + "/obj/build/images/fvm.blk": "image", ".ssh/pkey": "key", "out/" + arch + ".zircon/kernel-" + arch + "-kasan/obj/kernel/zircon.elf": "obj/zircon.elf", - "out/" + arch + ".zircon/multiboot.bin": "kernel", + "out/" + arch + "/multiboot.bin": "kernel", "out/" + arch + "/fuchsia-ssh.zbi": "initrd", } { fullSrc := filepath.Join(params.KernelDir, filepath.FromSlash(src)) |