diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-06-21 14:53:21 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-06-22 16:40:45 +0200 |
| commit | 94ef62054cd1f18fb4deaff776695f5a1670a358 (patch) | |
| tree | 2d0232ec9f20e636b7c5fa12bcd22167948129f1 /syz-ci | |
| parent | 2a075d57ab619ae5333c823cc260a722ab0c47fe (diff) | |
| download | syzkaller-94ef62054cd1f18fb4deaff776695f5a1670a358.tar.gz | |
pkg/build: move from pkg/kernel
Rename pkg/kernel to pkg/build and prepare for multi-OS support.
Diffstat (limited to 'syz-ci')
| -rw-r--r-- | syz-ci/jobs.go | 4 | ||||
| -rw-r--r-- | syz-ci/manager.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go index 3866c8a60..b4268344d 100644 --- a/syz-ci/jobs.go +++ b/syz-ci/jobs.go @@ -11,9 +11,9 @@ import ( "time" "github.com/google/syzkaller/dashboard/dashapi" + "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/log" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/syz-manager/mgrconfig" @@ -204,7 +204,7 @@ func (jp *JobProcessor) test(job *Job) error { resp.Build.KernelCommitTitle = kernelCommit.Title resp.Build.KernelCommitDate = kernelCommit.Date - if err := kernel.Clean(kernelDir); err != nil { + if err := build.Clean(kernelDir); err != nil { return fmt.Errorf("kernel clean failed: %v", err) } if len(req.Patch) != 0 { diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 1341004ce..10794beeb 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -11,11 +11,11 @@ import ( "time" "github.com/google/syzkaller/dashboard/dashapi" + "github.com/google/syzkaller/pkg/build" "github.com/google/syzkaller/pkg/config" "github.com/google/syzkaller/pkg/git" "github.com/google/syzkaller/pkg/hash" "github.com/google/syzkaller/pkg/instance" - "github.com/google/syzkaller/pkg/kernel" "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" @@ -75,7 +75,7 @@ func createManager(cfg *Config, mgrcfg *ManagerConfig, stop chan struct{}) *Mana } // Assume compiler and config don't change underneath us. - compilerID, err := kernel.CompilerIdentity(mgrcfg.Compiler) + compilerID, err := build.CompilerIdentity(mgrcfg.Compiler) if err != nil { log.Fatal(err) } @@ -271,7 +271,7 @@ func (mgr *Manager) build() error { return fmt.Errorf("failed to write tag file: %v", err) } - if err := kernel.Build(mgr.kernelDir, mgr.mgrcfg.Compiler, kernelConfigData); err != nil { + if err := build.Build(mgr.kernelDir, mgr.mgrcfg.Compiler, kernelConfigData); err != nil { rep := &report.Report{ Title: fmt.Sprintf("%v build error", mgr.mgrcfg.RepoAlias), Output: []byte(err.Error()), @@ -288,7 +288,7 @@ func (mgr *Manager) build() error { image := filepath.Join(tmpDir, "image") key := filepath.Join(tmpDir, "key") - err = kernel.CreateImage(mgr.managercfg.TargetOS, mgr.managercfg.TargetVMArch, mgr.managercfg.Type, + err = build.CreateImage(mgr.managercfg.TargetOS, mgr.managercfg.TargetVMArch, mgr.managercfg.Type, mgr.kernelDir, mgr.mgrcfg.Userspace, mgr.mgrcfg.KernelCmdline, mgr.mgrcfg.KernelSysctl, image, key) if err != nil { return fmt.Errorf("image build failed: %v", err) |