From d09a902e9d8663c6efcf5ef2ec6e32161d3dea71 Mon Sep 17 00:00:00 2001 From: Marco Vanotti Date: Wed, 13 Mar 2019 13:01:38 -0700 Subject: 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` --- pkg/build/build.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg') 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{}}, -- cgit mrf-deployment