From b08ee62aecfa850eac53b4dd903299d32b5c567d Mon Sep 17 00:00:00 2001 From: Julia Hansbrough Date: Thu, 15 Nov 2018 14:21:21 -0800 Subject: [fuchsia] SSH fix and build invocation fix. SSH keys are now included at the fx clean-build config. A proper escape sequence looked weird so use a string literal to pass that config. Fixed some typos I found while debugging. --- pkg/build/fuchsia.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkg') diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index 40a913366..ca8b2e789 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -22,13 +22,12 @@ func (fu fuchsia) build(targetArch, vmType, kernelDir, outputDir, compiler, user } arch := sysTarget.KernelHeaderArch if _, err := osutil.RunCmd(time.Hour, kernelDir, "scripts/fx", "clean-build", arch, - "--packages", "garnet/packages/products/sshd", - "--args=extra_authorized_keys_file=\"//.ssh/authorized_keys\""); err != nil { + "--args", `extra_authorized_keys_file="//.ssh/authorized_keys"`, + "--packages", "garnet/packages/products/sshd", "--product", "garnet/products/default.gni"); err != nil { return err } for src, dst := range map[string]string{ "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", "out/" + arch + "/fuchsia.zbi": "initrd", -- cgit mrf-deployment