From 37668e463d42d68846539559443ec458c9b05acb Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Wed, 19 Jul 2023 13:59:59 +0200 Subject: pkg/vcs: apply more backports to Linux Factor out the code that cherry-picks missing fixes to a Linux repo. Add two more commits that address issues with older kernel revisions. --- pkg/vcs/linux.go | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'pkg/vcs/linux.go') diff --git a/pkg/vcs/linux.go b/pkg/vcs/linux.go index 341e488f4..16e1c79fa 100644 --- a/pkg/vcs/linux.go +++ b/pkg/vcs/linux.go @@ -167,24 +167,10 @@ func (ctx *linux) EnvForCommit( Compiler: compiler, KernelConfig: cf.Serialize(), } - - // Compiling v4.6..v5.11 with a modern objtool, w/o this patch, results in the - // following issue, when compiling with clang: - // arch/x86/entry/thunk_64.o: warning: objtool: missing symbol table - // We don't bisect that far back with neither clang nor gcc, so this should be fine: - fix := "1d489151e9f9d1647110277ff77282fe4d96d09b" - fixTitle := "objtool: Don't fail on missing symbol table" - searchResult, err := ctx.git.GetCommitByTitle(fixTitle) + err = linuxFixBackports(ctx.git) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to cherry pick fixes: %w", err) } - if searchResult == nil { - _, err := ctx.git.git("cherry-pick", "--no-commit", fix) - if err != nil { - return nil, err - } - } - return env, nil } -- cgit mrf-deployment