diff options
| author | Marco Vanotti <mvanotti@google.com> | 2019-03-13 13:01:38 -0700 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-03-14 07:13:58 +0100 |
| commit | d09a902e9d8663c6efcf5ef2ec6e32161d3dea71 (patch) | |
| tree | 071c35c4a7a8b25ddca54ad8f449e26c254f520c | |
| parent | 2881fc25a8b874becd6b5c31668ebaeb7c6e9646 (diff) | |
pkg/build: fix getBuilder for fuchsia.
This CL changes the supported vmType for fuchsia to be QEMU, instead of
GCE.
This was broken by commit b4e5a74e4, which changed the behavior of
getBuilder. It was part of a 6-commit PR trying to add support for
FreeBSD.
That commit has caused syzkaller to stop being able to build the fuchsia
image, getting the following error:
`kernel build failed: unsupported image type fuchsia/amd64/qemu`
| -rw-r--r-- | pkg/build/build.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/build/build.go b/pkg/build/build.go index 44ea043a8..31910e04b 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -71,8 +71,8 @@ func getBuilder(targetOS, targetArch, vmType string) (builder, error) { }{ {"linux", "amd64", []string{"gvisor"}, gvisor{}}, {"linux", "amd64", []string{"gce", "qemu"}, linux{}}, - {"fuchsia", "amd64", []string{"gce"}, fuchsia{}}, - {"fuchsia", "arm64", []string{"gce"}, fuchsia{}}, + {"fuchsia", "amd64", []string{"qemu"}, fuchsia{}}, + {"fuchsia", "arm64", []string{"qemu"}, fuchsia{}}, {"akaros", "amd64", []string{"qemu"}, akaros{}}, {"openbsd", "amd64", []string{"gce", "vmm"}, openbsd{}}, {"netbsd", "amd64", []string{"gce", "qemu"}, netbsd{}}, |