From 6e8d317a30b10ef66599864020a11ff885cee2f5 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Mon, 18 Aug 2025 14:15:37 +0200 Subject: pkg/build: move kernel release overrides to make args When set as env variables, these don't seem to have any effect, but start to work as indended when passed as explicit make arguments. --- pkg/build/linux.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkg/build/linux.go') diff --git a/pkg/build/linux.go b/pkg/build/linux.go index e19eec60e..6fc15733d 100644 --- a/pkg/build/linux.go +++ b/pkg/build/linux.go @@ -175,9 +175,6 @@ func runMake(params Params, extraArgs ...string) error { "KBUILD_BUILD_TIMESTAMP=now", "KBUILD_BUILD_USER=syzkaller", "KBUILD_BUILD_HOST=syzkaller", - "KERNELVERSION=syzkaller", - "KERNELRELEASE=syzkaller", - "LOCALVERSION=-syzkaller", ) output, err := osutil.Run(time.Hour, cmd) params.Tracer.Log("Build log:\n%s", output) @@ -186,6 +183,11 @@ func runMake(params Params, extraArgs ...string) error { func LinuxMakeArgs(target *targets.Target, compiler, linker, ccache, buildDir string, jobs int) []string { args := []string{ + // Make still overrides these if they are passed as env variables. + // Let's pass them directly as make arguments. + "KERNELVERSION=syzkaller", + "KERNELRELEASE=syzkaller", + "LOCALVERSION=-syzkaller", "-j", fmt.Sprint(jobs), "ARCH=" + target.KernelArch, } -- cgit mrf-deployment