diff options
| author | Julia Hansbrough <flowerhack@google.com> | 2019-02-27 21:44:58 -0800 |
|---|---|---|
| committer | Greg Steuck <blackgnezdo@gmail.com> | 2019-02-27 21:44:58 -0800 |
| commit | 09aeeba49f9105ef18e4e1bd136492a57b7e7b6b (patch) | |
| tree | 0518391c597342d5b58ca59383432cb4c507ff3b /pkg | |
| parent | 34ec456bcf7c51fadfa01804ab33bdb22db8bf8f (diff) | |
fuchsia: Update Syzkaller to pull from Fuchsia monorepo (#1021)
Fuchsia and its repos now live in a new spot!
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/fuchsia.go | 6 | ||||
| -rw-r--r-- | pkg/vcs/fuchsia.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index 48680c526..bc066c3eb 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -29,9 +29,9 @@ func (fu fuchsia) build(targetArch, vmType, kernelDir, outputDir, compiler, user for src, dst := range map[string]string{ "out/" + arch + "/obj/build/images/fvm.blk": "image", ".ssh/pkey": "key", - "out/build-zircon/build-" + arch + "/zircon.elf": "obj/zircon.elf", - "out/build-zircon/build-" + arch + "/multiboot.bin": "kernel", - "out/" + arch + "/fuchsia.zbi": "initrd", + "out/build-zircon/kernel-" + arch + "-gcc/obj/kernel/zircon.elf": "obj/zircon.elf", + "out/build-zircon/multiboot.bin": "kernel", + "out/" + arch + "/fuchsia.zbi": "initrd", } { fullSrc := filepath.Join(kernelDir, filepath.FromSlash(src)) fullDst := filepath.Join(outputDir, filepath.FromSlash(dst)) diff --git a/pkg/vcs/fuchsia.go b/pkg/vcs/fuchsia.go index 04d8e5d36..07626cd5e 100644 --- a/pkg/vcs/fuchsia.go +++ b/pkg/vcs/fuchsia.go @@ -51,8 +51,8 @@ func (ctx *fuchsia) initRepo() error { if err := osutil.SandboxChown(tmpDir); err != nil { return err } - cmd := "curl -s 'https://fuchsia.googlesource.com/scripts/+/master/bootstrap?format=TEXT' |" + - "base64 --decode | bash -s garnet" + cmd := "curl -s 'https://fuchsia.googlesource.com/fuchsia/+/master/scripts/bootstrap?format=TEXT' |" + + "base64 --decode | bash" if _, err := runSandboxed(tmpDir, "bash", "-c", cmd); err != nil { return err } |