diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2025-08-18 14:15:37 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-08-18 20:34:46 +0000 |
| commit | 6e8d317a30b10ef66599864020a11ff885cee2f5 (patch) | |
| tree | d58ae5665a2ce0b9f72e05444c09985f8181201f /pkg | |
| parent | 8f3301ce38a7dd1b7553299247a04c0c5dcb9cdb (diff) | |
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.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/linux.go | 8 |
1 files changed, 5 insertions, 3 deletions
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, } |