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/bisect/bisect.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/bisect') diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go index f2770d6ce..4e2ee143f 100644 --- a/pkg/bisect/bisect.go +++ b/pkg/bisect/bisect.go @@ -9,9 +9,9 @@ import ( "path/filepath" "time" + "github.com/google/syzkaller/pkg/build" "github.com/google/syzkaller/pkg/git" "github.com/google/syzkaller/pkg/instance" - "github.com/google/syzkaller/pkg/kernel" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/syz-manager/mgrconfig" ) @@ -101,7 +101,7 @@ func (env *env) bisect() (*git.Commit, error) { if env.head, err = git.Poll(cfg.Manager.KernelSrc, cfg.Kernel.Repo, cfg.Kernel.Branch); err != nil { return nil, err } - if err := kernel.Clean(cfg.Manager.KernelSrc); err != nil { + if err := build.Clean(cfg.Manager.KernelSrc); err != nil { return nil, fmt.Errorf("kernel clean failed: %v", err) } env.log("building syzkaller on %v", cfg.Syzkaller.Commit) @@ -214,13 +214,13 @@ func (env *env) test() (git.BisectResult, error) { if err != nil { return 0, err } - compilerID, err := kernel.CompilerIdentity(be.compiler) + compilerID, err := build.CompilerIdentity(be.compiler) if err != nil { return 0, err } env.log("testing commit %v with %v", current.Hash, compilerID) buildStart := time.Now() - if err := kernel.Clean(cfg.Manager.KernelSrc); err != nil { + if err := build.Clean(cfg.Manager.KernelSrc); err != nil { return 0, fmt.Errorf("kernel clean failed: %v", err) } err = env.inst.BuildKernel(be.compiler, cfg.Kernel.Userspace, -- cgit mrf-deployment