Skip to content

Comments

Linux kernel updates 2022-09-29#193561

Merged
Ma27 merged 14 commits intoNixOS:masterfrom
Ma27:linux-kernel-updates
Oct 1, 2022
Merged

Linux kernel updates 2022-09-29#193561
Ma27 merged 14 commits intoNixOS:masterfrom
Ma27:linux-kernel-updates

Conversation

@Ma27
Copy link
Member

@Ma27 Ma27 commented Sep 29, 2022

Description of changes

Still a draft while I'm testing the changes.

Note: the kernel-generic tests don't evaluate right now, apparently because of #193485.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Sep 29, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Sep 29, 2022
@Ma27
Copy link
Member Author

Ma27 commented Sep 29, 2022

Kernels are building and working fine for me. For testing purposes I reverted the PR I linked above to make kernel-generic.nix evaluatable again.

The thing is, I'm kinda hesitant to push the revert because the change is related to fixing a channel blocker (cc @roberth).

I'll remove the draft status though because the kernel updates seem fine.

@Ma27 Ma27 marked this pull request as ready for review September 29, 2022 20:47
@roberth
Copy link
Member

roberth commented Sep 30, 2022

The tests do evaluate, but not kernel-generic.nix is not a valid entrypoint for evaluation anymore.
For example, nix-build -A nixosTests.kernel-generic.linux_4_9 and nix-build nixos/release.nix -A tests.kernel-generic.linux_4_9.x86_64-linux work fine.
As does nix-build nixos/tests/kernel-generic.nix -A linux_4_9.test. Breaking this third way of wiring and invoking the test is not so great. There's probably something hacky we could do with the // operator to magically make it work, but that's awful. I'll have another look later.
For the time being at least the code paths used by hydra and ofborg are ok, fwiw.

@Ma27 Ma27 merged commit 197e5e5 into NixOS:master Oct 1, 2022
@Ma27 Ma27 deleted the linux-kernel-updates branch October 1, 2022 18:28
@github-actions
Copy link
Contributor

github-actions bot commented Oct 1, 2022

Successfully created backport PR #193958 for release-22.05.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: kernel The Linux kernel 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants