Skip to content

Comments

nixos/initrd: add extraFirmwarePaths option#391166

Merged
ElvishJerricco merged 1 commit intoNixOS:masterfrom
jmbaur:extra-firmware-paths
Mar 19, 2025
Merged

nixos/initrd: add extraFirmwarePaths option#391166
ElvishJerricco merged 1 commit intoNixOS:masterfrom
jmbaur:extra-firmware-paths

Conversation

@jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Mar 19, 2025

Some platforms don't specify firmware needed by kernel drivers in the driver code itself (i.e. query-able with modinfo). Platforms that use devicetree often specify firmware in the devicetree itself (to see what boards do this from a linux source tree, run grep -r 'firmware-name =' arch/*/boot/dts). Since our existing initrd builder cannot auto-detect all firmware to include in this case outlined above, we should provide a way to specify extra firmware files to include in the initrd.

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.

(cherry picked from commit 488d4316b9e1510c9b4a2eeb8d7e2cc66839a1fc)
@jmbaur jmbaur requested a review from ElvishJerricco March 19, 2025 03:46
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: kernel The Linux kernel 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. labels Mar 19, 2025
@jmbaur jmbaur requested a review from arianvp March 19, 2025 03:48
@nix-owners nix-owners bot requested review from aanderse, flokli and philiptaron March 19, 2025 03:48
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 19, 2025
Copy link
Contributor

@ElvishJerricco ElvishJerricco left a comment

Choose a reason for hiding this comment

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

Otherwise, LGTM

@ElvishJerricco ElvishJerricco merged commit b15e9e7 into NixOS:master Mar 19, 2025
35 checks passed
@jmbaur jmbaur deleted the extra-firmware-paths branch March 20, 2025 01:54
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 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants