Skip to content

systemd-boot: Revert boot counting again#334526

Merged
emilazy merged 2 commits into
NixOS:masterfrom
ElvishJerricco:revert-boot-counting-again-sadface
Aug 14, 2024
Merged

systemd-boot: Revert boot counting again#334526
emilazy merged 2 commits into
NixOS:masterfrom
ElvishJerricco:revert-boot-counting-again-sadface

Conversation

@ElvishJerricco

Copy link
Copy Markdown
Contributor

Description of changes

Unfortunately, with the specialisation-related regression caused by boot counting, and fixes like #334473 being generally hasty and unsatisfactory, the most effective way to unblock the unstable channel is to simply revert boot counting.

This was made a little tricky, as there were three, other, PRs that were merged for systemd-boot this week, which interfered with the revert. I believe I've preserved those PRs correctly, and all systemd-boot tests seem to pass, including the specialisation one on aarch64 (it's the only one testing the devicetree change).

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

…e-regex"

This reverts commit fc35704, reversing
changes made to c67d90d.
This reverts commit 3d3c0f4, reversing
changes made to 47f7e25.
@ElvishJerricco ElvishJerricco requested review from a team and JulienMalka as code owners August 14, 2024 03:12
@github-actions github-actions Bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 14, 2024

@emilazy emilazy left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks reasonable at a skim. I hope we can get this back ASAP once the dust has settled and the channels are moving again. I will check tests on aarch64-linux.

@ofborg ofborg 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 Aug 14, 2024
@emilazy emilazy merged commit 57d0d4a into NixOS:master Aug 14, 2024
@Mic92

Mic92 commented Aug 14, 2024

Copy link
Copy Markdown
Member

I don't have an intermediate use case for boot counting, so I probably won't spend time on getting it to work. This was only happening on aarch64, right?

@emilazy

emilazy commented Aug 14, 2024

Copy link
Copy Markdown
Member

No, eval broke for the entire channel.

@ElvishJerricco

Copy link
Copy Markdown
Contributor Author

And the specialisation bug was platform independent

iFreilicht added a commit to iFreilicht/.dotfiles that referenced this pull request Aug 26, 2024
Now I don't need to carry around an old version of nixpkgs just for
nextcloud 27 anymore.
I mainly wanted to do this update because of boot counting, but that has
since been reverted: NixOS/nixpkgs#334526
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 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.

3 participants