From 48bc529a18de54dddab161d995fc3abd85a670a8 Mon Sep 17 00:00:00 2001 From: Space Meyer Date: Mon, 9 Jan 2023 13:51:24 +0100 Subject: pkg/instance: move BuildKernel() args to struct --- pkg/bisect/bisect.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkg/bisect/bisect.go') diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go index ed961f537..28e8c56d0 100644 --- a/pkg/bisect/bisect.go +++ b/pkg/bisect/bisect.go @@ -479,8 +479,15 @@ func (env *env) build() (*vcs.Commit, string, error) { return current, "", fmt.Errorf("kernel clean failed: %v", err) } kern := &env.cfg.Kernel - _, imageDetails, err := env.inst.BuildKernel(bisectEnv.Compiler, env.cfg.Linker, env.cfg.Ccache, kern.Userspace, - kern.Cmdline, kern.Sysctl, bisectEnv.KernelConfig) + _, imageDetails, err := env.inst.BuildKernel(&instance.BuildKernelConfig{ + CompilerBin: bisectEnv.Compiler, + LinkerBin: env.cfg.Linker, + CcacheBin: env.cfg.Ccache, + UserspaceDir: kern.Userspace, + CmdlineFile: kern.Cmdline, + SysctlFile: kern.Sysctl, + KernelConfig: bisectEnv.KernelConfig, + }) if imageDetails.CompilerID != "" { env.log("compiler: %v", imageDetails.CompilerID) } -- cgit mrf-deployment