Skip to content

linux-rpi & raspberrypifw: stable_20241008 -> stable_20250127, raspberrypiWirelessFirmware: unstable-2024-02-26 -> unstable-2024-12-23 #386454

Closed
peat-psuwit wants to merge 3 commits intoNixOS:masterfrom
peat-psuwit:for-upstream/linux-rpi_20250127
Closed

linux-rpi & raspberrypifw: stable_20241008 -> stable_20250127, raspberrypiWirelessFirmware: unstable-2024-02-26 -> unstable-2024-12-23 #386454
peat-psuwit wants to merge 3 commits intoNixOS:masterfrom
peat-psuwit:for-upstream/linux-rpi_20250127

Conversation

@peat-psuwit
Copy link
Contributor

@peat-psuwit peat-psuwit commented Mar 2, 2025

  • linux-rpi contains change between upstream 6.6.51 and 6.6.74 + RPi-specific changes. This compare might paint some picture on what additional commits are made on top of 6.6.74, but I'm not sure if I specify the compare arguments correctly.
  • raspberrypifw changes contain 1 actual firmware upgrade and 2 kernel binary upgrades.
  • Change of raspberrypiWirelessFirmware comes from firmware-nonfree. Changes include new Wi-Fi firmware for WPA3 offload and new symlinks for CM5 and Raspberry Pi 500.

Things done

  • Built on platform(s)
    • x86_64-linux (N/A)
    • aarch64-linux (For linux_rpi4)
    • x86_64-darwin (N/A)
    • aarch64-darwin (N/A)
  • 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 Mar 2, 2025
@peat-psuwit peat-psuwit changed the title linux-rpi: 6.6.51-stable_20241008 -> 6.6.74-stable_20250127, raspberrypifw: 1.20241008 -> 1.20250127, raspberrypiWirelessFirmware: unstable-2024-02-26 -> unstable-2024-12-23 linux-rpi & raspberrypifw: stable_20241008 -> stable_20250127, raspberrypiWirelessFirmware: unstable-2024-02-26 -> unstable-2024-12-23 Mar 2, 2025
@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 2, 2025
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@Luflosi Luflosi mentioned this pull request May 11, 2025
Open
Luflosi
Luflosi approved these changes May 11, 2025
View reviewed changes
Copy link
Contributor

@Luflosi Luflosi left a comment

Choose a reason for hiding this comment

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

LGTM.

@nbdd0121
Copy link
Member

nbdd0121 commented May 11, 2025

Latest tag is now 20250428

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 13, 2025
@peat-psuwit
Copy link
Contributor Author

peat-psuwit commented May 14, 2025

Latest tag is now 20250428

20250428 would entail upgrading kernel from 6.6.y series to 6.12.y series. We might want to avoid that until NixOS 25.05 branch off?

@Luflosi
Copy link
Contributor

Luflosi commented May 14, 2025

I would really like to upgrade raspberrypifw to version 1.20250430 before the release because of #406201. This won't fix the issue for users who are already running NixOS on their Raspberry Pi 4 but it will at least fix the problem for users installing the new release on their Raspberry Pi 4 for the first time.

What problems could occur if only raspberrypifw is updated and not the kernel or the wireless firmware?

@peat-psuwit
Copy link
Contributor Author

peat-psuwit commented May 14, 2025

I would really like to upgrade raspberrypifw to version 1.20250430 before the release because of #406201. This won't fix the issue for users who are already running NixOS on their Raspberry Pi 4 but it will at least fix the problem for users installing the new release on their Raspberry Pi 4 for the first time.

What problems could occur if only raspberrypifw is updated and not the kernel or the wireless firmware?

I don't know. Historically in embedded world the firmware and the kernel is somewhat coupled and things might break. But since Raspberry Pi has some mainline support, maybe it's fine?

I'm not sure I'm qualified to answer this, and unfortunately I probably won't have enough time to update this before branch off happens on May 16. So I might end up updating this PR after 25.05 release to skip to 20250428 (or newer).

@as3ii
Copy link
Contributor

as3ii commented May 27, 2025 •
edited
Loading

Is there any news? 3 days ago the PR #362763 has been updated to target 1.20250430.
Will this PR be updated to target the kernel 20250428?

@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 25, 2025
@fpletz fpletz mentioned this pull request Jul 11, 2025
Merged
13 tasks
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 11, 2025
@Ma27 Ma27 closed this in #424330 Jul 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TredwellGit TredwellGit Awaiting requested review from TredwellGit

@Ma27 Ma27 Awaiting requested review from Ma27

@NeQuissimus NeQuissimus Awaiting requested review from NeQuissimus

@dezgeg dezgeg Awaiting requested review from dezgeg

@alyssais alyssais Awaiting requested review from alyssais

@K900 K900 Awaiting requested review from K900

@lopsided98 lopsided98 Awaiting requested review from lopsided98

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

1 more reviewer

@Luflosi Luflosi Luflosi approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: kernel The Linux kernel 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@peat-psuwit @nbdd0121 @Luflosi @as3ii @wegank