Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.09] Switch latest kernel to 5.10 #108609

Merged
merged 16 commits into from Jan 12, 2021
Merged

[20.09] Switch latest kernel to 5.10 #108609

merged 16 commits into from Jan 12, 2021

Conversation

NeQuissimus
Copy link
Member

Motivation for this change

The 5.8 and 5.9 kernels have been EOL'd.
5.10 has been on master for a while now (I have been using it daily since 5.10.1)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@NeQuissimus NeQuissimus marked this pull request as ready for review January 6, 2021 19:50
@NeQuissimus NeQuissimus changed the title 2009 kernel510 [20.09] Switch latest kernel to 5.10 Jan 7, 2021
@NeQuissimus
Copy link
Member Author

@ofborg test kernel-latest kernel-lts latestKernel.login latestKernel.hardened

@NeQuissimus
Copy link
Member Author

I cannot figure out why ofborg fails building 5.10.5.a for the test on x64... I am posting this from 5.10.5.a on an x64 :)

@lheckemann
Copy link
Member 

chmod: missing operand after 'u-w'
Try 'chmod --help' for more information.

Maybe you didn't backport the fix from 3088dcb correctly?

@jonringer
Copy link
Contributor

IIRC there was a lot of kernel modules which aren't support in 5.10.

However, people should be using an LTS kernel if they want LTS behavior

@NeQuissimus
Copy link
Member Author

@lheckemann Ah, that might be it

@NeQuissimus
Copy link
Member Author

@ofborg test kernel-latest kernel-lts latestKernel.login latestKernel.hardened

jonringer
jonringer approved these changes Jan 10, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff and intention LGTM

but this should target staging-20.09, as it does 1000+ rebuilds (I'm assuming most of these are kernel modules), but then we can stabilize failing modules as well.

Atemu
Atemu requested changes Jan 10, 2021
View reviewed changes
Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

20.09's ZFSs are not compatible with 5.10.

We should at least backport #108646 to zfsUnstable before we bump _latest.

@Atemu Atemu mentioned this pull request Jan 10, 2021
Merged
10 tasks
@NeQuissimus
linux: Add 5.10
50664aa 
Validated via
```
 nix-build ./nixos/release.nix -A tests.kernel-latest.x86_64-linux -A tests.latestKernel.login.x86_64-linux
```

(cherry picked from commit c1ef6d2)
@NeQuissimus
linux: 5.10 -> 5.10.1
412c56a 
(cherry picked from commit a83bf32)
@NeQuissimus
linux: 5.10.1 -> 5.10.2
09d78d0 
(cherry picked from commit 9dc0ab9)
@NeQuissimus
linux: 5.10.2 -> 5.10.3
75e95c9 
(cherry picked from commit b24e814)
@NeQuissimus
linux: 5.10.3 -> 5.10.4
823be7a 
(cherry picked from commit 3785b18)
@NeQuissimus
linux: 5.10.4 -> 5.10.5
202f7ad 
(cherry picked from commit 6d1f725)
@NeQuissimus
linux/hardened/patches/5.10: init at 5.10.4.a
6b7e8bc 
(cherry picked from commit 5f4c27e)
@NeQuissimus
linux-hardened: Switch to 5.10
c00fcdf 
(cherry picked from commit ed4d6a8)
@NeQuissimus
linux: Remove 5.8
6205feb 
Kernel version is EOL
@NeQuissimus
linux: Remove 5.9
390cc18 
Kernel version is EOL
@NeQuissimus
linux/hardened/patches/5.10: 5.10.4.a -> 5.10.5.a
5095099 
(cherry picked from commit 91e76b1)
@NeQuissimus
linux/hardened/patches/5.4: 5.4.86.a -> 5.4.87.a
3d1b69f 
(cherry picked from commit 2fe7c5c)
@NeQuissimus
linux/hardened/patches/4.19: 4.19.164.a -> 4.19.165.a
af50a34 
(cherry picked from commit 2a23529)
@NeQuissimus
linux-hardened: Track extra version
7e6e434 
Fixes NixOS#108707

(cherry picked from commit 4312cd7)
@NeQuissimus
linux-hardened: Add extra to 5.8
384095f
@NeQuissimus
linux-hardened: Remove 5.8 and 5.9
074a3dd
@NeQuissimus NeQuissimus changed the base branch from release-20.09 to staging-20.09 January 10, 2021 19:23
@NeQuissimus
Copy link
Member Author

Rebased onto staging-20.09

@lheckemann lheckemann merged commit f2ce6f0 into NixOS:staging-20.09 Jan 12, 2021
@lheckemann
Copy link
Member

lheckemann commented Jan 12, 2021 •
edited

Backported 2.0.1 bump as well: c021683 (thanks @cole-h and @Atemu )

@NeQuissimus NeQuissimus deleted the 2009_kernel510 branch January 12, 2021 14:06
@NeQuissimus NeQuissimus mentioned this pull request Jan 12, 2021
Merged
10 tasks
NeQuissimus referenced this pull request Jan 15, 2021
@kraem @NeQuissimus
linux/hardened/patches/5.4: 5.4.88.a -> 5.4.89.a
0768790 
(cherry picked from commit dca6184)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Atemu Atemu Atemu requested changes

@jonringer jonringer jonringer approved these changes

@layus layus Awaiting requested review from layus

@teto teto Awaiting requested review from teto

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@NeQuissimus @lheckemann @jonringer @Atemu