diff options
| author | Julia Hansbrough <flowerhack@google.com> | 2018-11-12 15:38:24 -0800 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-11-12 19:07:01 -0800 |
| commit | 5f5f6d14e80b8bd6b42db961118e902387716bcb (patch) | |
| tree | 563609dbd231f276f6de5a347069be7c1f4af9d2 /pkg | |
| parent | 4fc13fd6ae51fdf3230dde4f31a32feb4861ca37 (diff) | |
[fuchsia] Fix Fuchsia build.
* Needed to clean out the build on the main host. We switched to a
"petal" layout which required a complete rebuild.
* Update SSH interface. SSH keys have to be set at buildtime via
--args.
* Update fvm.blk location.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/fuchsia.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index d05df7dd7..3c31878b1 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -21,12 +21,14 @@ func (fu fuchsia) build(targetArch, vmType, kernelDir, outputDir, compiler, user return fmt.Errorf("unsupported fuchsia arch %v", targetArch) } arch := sysTarget.KernelHeaderArch + // TODO check if set-layer required? if _, err := osutil.RunCmd(time.Hour, kernelDir, "scripts/fx", "clean-build", arch, - "--packages", "garnet/packages/products/sshd"); err != nil { + "--packages", "garnet/packages/products/sshd", "--args", + "'extra_authorized_keys_file=\"//.ssh/authorized_keys\"'"); err != nil { return err } for src, dst := range map[string]string{ - "out/" + arch + "/images/fvm.blk": "image", + "out/" + arch + "/obj/build/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", |