From 1628b0078d029469c90644c3e8ba5acf7c307c6a Mon Sep 17 00:00:00 2001 From: Space Meyer Date: Tue, 2 Aug 2022 12:42:01 +0000 Subject: pkg/vcs: remove cherry-pick for making very old linux versions boot We no longer support bisecting this far back anyhow. Plus the way this checks for tags conflicts with future changes in this branch. --- pkg/vcs/linux.go | 7 ------- 1 file changed, 7 deletions(-) (limited to 'pkg/vcs') diff --git a/pkg/vcs/linux.go b/pkg/vcs/linux.go index c6eb663cd..d48db3256 100644 --- a/pkg/vcs/linux.go +++ b/pkg/vcs/linux.go @@ -136,13 +136,6 @@ func (ctx *linux) EnvForCommit(binDir, commit string, kernelConfig []byte) (*Bis Compiler: filepath.Join(binDir, "gcc-"+linuxCompilerVersion(tags), "bin", "gcc"), KernelConfig: cf.Serialize(), } - // v4.0 doesn't boot with our config nor with defconfig, it halts on an interrupt in x86_64_start_kernel. - if !tags["v4.1"] { - _, err := ctx.git.git("cherry-pick", "--no-commit", "99124e4db5b7b70daeaaf1d88a6a8078a0004c6e") - if err != nil { - return nil, err - } - } return env, nil } -- cgit mrf-deployment