diff options
| author | Julia Hansbrough <flowerhack@google.com> | 2018-11-15 14:21:21 -0800 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-11-16 11:58:29 -0800 |
| commit | b08ee62aecfa850eac53b4dd903299d32b5c567d (patch) | |
| tree | 579332921a08ca40b2625d12b452b771f778a0fd | |
| parent | f5e275d1d9ad023a25bb60af9011b452ad9cbaf9 (diff) | |
[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.
| -rw-r--r-- | pkg/build/fuchsia.go | 5 | ||||
| -rw-r--r-- | syz-ci/syzupdater.go | 4 |
2 files changed, 4 insertions, 5 deletions
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", diff --git a/syz-ci/syzupdater.go b/syz-ci/syzupdater.go index 56c24a0c7..ee4f86140 100644 --- a/syz-ci/syzupdater.go +++ b/syz-ci/syzupdater.go @@ -256,10 +256,10 @@ func (upd *SyzUpdater) build(commit *vcs.Commit) error { } tagFile := filepath.Join(upd.syzkallerDir, "tag") if err := osutil.WriteFile(tagFile, []byte(commit.Hash)); err != nil { - return fmt.Errorf("filed to write tag file: %v", err) + return fmt.Errorf("failed to write tag file: %v", err) } if err := osutil.CopyFiles(upd.syzkallerDir, upd.latestDir, upd.syzFiles); err != nil { - return fmt.Errorf("filed to copy syzkaller: %v", err) + return fmt.Errorf("failed to copy syzkaller: %v", err) } return nil } |