From 94ef62054cd1f18fb4deaff776695f5a1670a358 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 21 Jun 2018 14:53:21 +0200 Subject: pkg/build: move from pkg/kernel Rename pkg/kernel to pkg/build and prepare for multi-OS support. --- pkg/instance/instance.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/instance/instance.go') diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index e7ab3c9ec..2294fed9b 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -14,9 +14,9 @@ import ( "strings" "time" + "github.com/google/syzkaller/pkg/build" "github.com/google/syzkaller/pkg/csource" "github.com/google/syzkaller/pkg/git" - "github.com/google/syzkaller/pkg/kernel" "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" @@ -79,13 +79,13 @@ func (env *Env) BuildSyzkaller(repo, commit string) error { func (env *Env) BuildKernel(compilerBin, userspaceDir, cmdlineFile, sysctlFile string, kernelConfig []byte) error { cfg := env.cfg - if err := kernel.Build(cfg.KernelSrc, compilerBin, kernelConfig); err != nil { + if err := build.Build(cfg.KernelSrc, compilerBin, kernelConfig); err != nil { return osutil.PrependContext("kernel build failed", err) } cfg.KernelObj = cfg.KernelSrc cfg.Image = filepath.Join(cfg.Workdir, "syz-image") cfg.SSHKey = filepath.Join(cfg.Workdir, "syz-key") - if err := kernel.CreateImage(cfg.TargetOS, cfg.TargetVMArch, cfg.Type, + if err := build.CreateImage(cfg.TargetOS, cfg.TargetVMArch, cfg.Type, cfg.KernelSrc, userspaceDir, cmdlineFile, sysctlFile, cfg.Image, cfg.SSHKey); err != nil { return osutil.PrependContext("image build failed", err) } -- cgit mrf-deployment