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

linux/common-config: Adjust some options unavailable on i686 #384588

Merged
merged 4 commits into from
Mar 19, 2025

Conversation

timschumi
Copy link
Member

@timschumi timschumi commented Feb 23, 2025

HID_BPF and SCHED_CLASS_EXT directly depend on BPF_JIT, so guard them with the same condition.

HAVE_RUST is explicitly only enabled for x86_64 in the x86 architecture configuration, so do not assume the kernel supports Rust when building for i686.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Feb 23, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Feb 23, 2025
@timschumi
Copy link
Member Author

ofborg or their workflow-y cousin do not seem to be able to recognize who is the maintainer for changes like this. To be perfectly honest, I am not able to do that either.

Pinging some people that look related according to recent kernel changes, apologies in advance.

@K900 @alyssais @fabianhjr

The ongoing RISC-V breakage may become version independent in the
future, move it to the correct condition before updating it with the
full list of supported architectures.

While at it, simplify the remaining rustc-specific conditions into an
`availableOn`.
@timschumi timschumi force-pushed the linux-6.12-i686 branch 3 times, most recently from a04ede0 to bcd4842 Compare March 17, 2025 20:32
This keeps us from accidentally running into platforms where Rust is not
supported by the Linux kernel itself (for that particular platform).
The table with kernel version and compiler requirements only starts from
Linux 6.12 now (the previous default), so update the force-enable logic
to accommodate users that don't want to follow those suggestions.

This includes printing warnings instead of asserting and allowing the
force-enable to override both the compiler check and the version (or
architecture) check.
BPF_JIT is not supported on i686, so we need to make sure that options
that depend on BPF_JIT don't get enabled either.
@K900 K900 merged commit f88a223 into NixOS:master Mar 19, 2025
25 of 27 checks passed
@timschumi timschumi deleted the linux-6.12-i686 branch March 19, 2025 09:35
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: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants