Skip to content

Commit 7da3726

Browse files
committed
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.
1 parent 1804e95 commit 7da3726

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

pkg/build/linux.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,6 @@ func runMake(params Params, extraArgs ...string) error {
175175
"KBUILD_BUILD_TIMESTAMP=now",
176176
"KBUILD_BUILD_USER=syzkaller",
177177
"KBUILD_BUILD_HOST=syzkaller",
178-
"KERNELVERSION=syzkaller",
179-
"KERNELRELEASE=syzkaller",
180-
"LOCALVERSION=-syzkaller",
181178
)
182179
output, err := osutil.Run(time.Hour, cmd)
183180
params.Tracer.Log("Build log:\n%s", output)
@@ -186,6 +183,11 @@ func runMake(params Params, extraArgs ...string) error {
186183

187184
func LinuxMakeArgs(target *targets.Target, compiler, linker, ccache, buildDir string, jobs int) []string {
188185
args := []string{
186+
// Make still overrides these if they are passed as env variables.
187+
// Let's pass them directly as make arguments.
188+
"KERNELVERSION=syzkaller",
189+
"KERNELRELEASE=syzkaller",
190+
"LOCALVERSION=-syzkaller",
189191
"-j", fmt.Sprint(jobs),
190192
"ARCH=" + target.KernelArch,
191193
}

0 commit comments

Comments
 (0)