Skip to content

seabios refactors#342692

Merged
symphorien merged 5 commits intoNixOS:masterfrom
museoa:upload-seabios
Oct 14, 2024
Merged

seabios refactors#342692
symphorien merged 5 commits intoNixOS:masterfrom
museoa:upload-seabios

Conversation

@AndersonTorres
Copy link
Member

@AndersonTorres AndersonTorres commented Sep 18, 2024

Description of changes

Closes #342650

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.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Sep 18, 2024
@AndersonTorres AndersonTorres marked this pull request as ready for review September 18, 2024 16:41
@AndersonTorres AndersonTorres mentioned this pull request Sep 29, 2024
Closed
13 tasks
SigmaSquadron
SigmaSquadron reviewed Sep 29, 2024
View reviewed changes
Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

Is the filename of the non-CSM build still Csm16.bin? I've sort of assumed that for #345324.

@AndersonTorres
Copy link
Member Author

AndersonTorres commented Sep 29, 2024

No, it's not. I need to fix this.

@AndersonTorres AndersonTorres force-pushed the upload-seabios branch 4 times, most recently from 5c358b0 to 3ca5870 Compare September 30, 2024 04:11
@AndersonTorres AndersonTorres changed the title seabios-no-csm: "init" seabios refactors Sep 30, 2024
@AndersonTorres
Copy link
Member Author

AndersonTorres commented Sep 30, 2024

@SigmaSquadron please look and test it.

@ofborg ofborg bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Sep 30, 2024
@AndersonTorres
Copy link
Member Author

AndersonTorres commented Sep 30, 2024

@ofborg build seabios-qemu seabios-coreboot

@SigmaSquadron
Copy link
Contributor

SigmaSquadron commented Sep 30, 2024 via email

@AndersonTorres
Copy link
Member Author

AndersonTorres commented Sep 30, 2024

I'd like to see the commit split into multiple ones, if possible: one for formatting, another for the biosfile stuff, and another for passthru. As it stands the diff is kind of hard to review.

Done!

@SigmaSquadron SigmaSquadron mentioned this pull request Sep 30, 2024
Merged
5 tasks
SigmaSquadron
SigmaSquadron reviewed Oct 2, 2024
View reviewed changes
Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

Overall looks good; a few nits:

pkgs/by-name/se/seabios/package.nix Outdated
Copy link
Contributor

@SigmaSquadron SigmaSquadron Oct 2, 2024

Choose a reason for hiding this comment

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

Suggested change
platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86;
platforms = lib.intersectLists lib.platforms.unix lib.platforms.x86_64;

Copy link
Member Author

@AndersonTorres AndersonTorres Oct 2, 2024

Choose a reason for hiding this comment

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

String-y platforms are considered legacy (

nixpkgs/lib/meta.nix

Line 208 in fd698a4

1. (legacy) a system string.
)

Copy link
Contributor

@SigmaSquadron SigmaSquadron Oct 2, 2024

Choose a reason for hiding this comment

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

Oh wow. Why is everyone still using it?

Copy link
Member Author

@AndersonTorres AndersonTorres Oct 2, 2024

Choose a reason for hiding this comment

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

I believe it is because the modern way is not so well documented and it is a bit harder to understand.

Further, there are some dark corners on Nixpkgs that still expect the stringy values.

SigmaSquadron
SigmaSquadron reviewed Oct 2, 2024
View reviewed changes
SigmaSquadron
SigmaSquadron approved these changes Oct 2, 2024
View reviewed changes
Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

Sorry for bothering you with the spurious reviews, and thank you for addressing this so quickly! LGTM.

@SigmaSquadron SigmaSquadron added the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 2, 2024
@AndersonTorres
seabios: new parameter ___build-type
525eeba 
It can assume the values "coreboot", "csm" and "qemu".

The triple-underscored kebab-cased format is a poor man's mitigation for the
problem of unexpected shadowing.
@AndersonTorres
seabios: passthru attribute firmware
dd122c5 
So that the caller can pick the exact location of the resulting BIOS.
@AndersonTorres
{seabios-coreboot, seabios-csm, seabios-qemu}: "init"
e032a06
@nixos-discourse
Copy link

nixos-discourse commented Oct 4, 2024

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/2009

@SigmaSquadron SigmaSquadron mentioned this pull request Oct 6, 2024
Closed
5 tasks
@symphorien symphorien merged commit 36ea34c into NixOS:master Oct 14, 2024
SigmaSquadron added a commit to SigmaSquadron/nixpkgs that referenced this pull request Oct 18, 2024
@SigmaSquadron
xen: switch to seabios-qemu, use absolute path to firmware
d175e88 
Related: NixOS#342692
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
@AndersonTorres AndersonTorres deleted the upload-seabios branch December 14, 2024 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SigmaSquadron SigmaSquadron SigmaSquadron approved these changes

Assignees

No one assigned

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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.

seabios: build non-CSM version for use by incus, lxd, etc?

4 participants

@AndersonTorres @SigmaSquadron @nixos-discourse @symphorien