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

xen: cleanup, code quality improvements #342915

Merged
merged 6 commits into from
Sep 19, 2024

Conversation

SigmaSquadron
Copy link
Contributor

@SigmaSquadron SigmaSquadron commented Sep 19, 2024

Description of changes

Minor changes and a cherry-pick of #341429 in preparation for a larger PR that begins building the MiniOS stubdomains.

Things done

  • Built on platform(s)
    • x86_64-linux
  • Tested, as applicable:
    I've been dogfooding this branch for a while now.
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review pr 342915". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.
    • Not sure. Let me know if the commits should be squashed.

Add a 👍 reaction to pull requests you find important.

Also makes it slightly more readable by adding line breaks between
attributes and reordering the knownVulnerabilities attribute to be
closer to the maintainers attribute, as they have similar checks.

Signed-off-by: Fernando Rodrigues <[email protected]>
Instead of using multiple inherit calls, just use a single one.

Signed-off-by: Fernando Rodrigues <[email protected]>
xenproject.org is the Xen Project's official domain. xen.org is
deprecated and we should avoid referring to Xen as just "xen" whenever
possible, due to a messy legal history with Citrix.

Signed-off-by: Fernando Rodrigues <[email protected]>
@SigmaSquadron SigmaSquadron changed the title xen: cleanup, code quality improvmeents xen: cleanup, code quality improvements Sep 19, 2024
@SigmaSquadron SigmaSquadron added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Sep 19, 2024
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Generally LGTM.

@@ -120,13 +127,13 @@ for version in "${supportedVersions[@]}"; do
echo -e "Found the following patches:\n \e[1;32mXen\e[0m: \e[1;33m$discoveredXenPatchesEcho\e[0m\n \e[1;36mQEMU\e[0m: \e[1;33m$discoveredQEMUPatchesEcho\e[0m\n \e[1;36mSeaBIOS\e[0m: \e[1;33m$discoveredSeaBIOSPatchesEcho\e[0m\n \e[1;36mOVMF\e[0m: \e[1;33m$discoveredOVMFPatchesEcho\e[0m\n \e[1;36miPXE\e[0m: \e[1;33m$discoveredIPXEPatchesEcho\e[0m"

# Prepare patches that are called in ./patches.nix.
defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458" "XSA_460" "XSA_461" )
defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_460" "XSA_461" )
Copy link
Member

Choose a reason for hiding this comment

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

What’s the deal with XSA_458?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Already included in 4.17.5, 4.18.3 and 4.19.0, so it's unused.

@SigmaSquadron

This comment was marked as outdated.

None of our Xen branches need it anymore.

Signed-off-by: Fernando Rodrigues <[email protected]>
- Drop `-ie` flags for grep;
- Add more `doing things...done` echo stanzas so it's clearer when a
part of the script has concluded;
- Add a note explaining why QEMU and OVMF take so long to fetch;
- Add a TODO for future work at the top of the file.

Signed-off-by: Fernando Rodrigues <[email protected]>
@SigmaSquadron SigmaSquadron marked this pull request as ready for review September 19, 2024 16:04
@SigmaSquadron
Copy link
Contributor Author

SigmaSquadron commented Sep 19, 2024

Big surprise. I was stupid and forgot how newlines work.


Result of nixpkgs-review pr 342915 run on x86_64-linux 1

28 packages built:
  • libvmi
  • libvmi.dev
  • libvmi.lib
  • qemu_xen
  • qemu_xen.debug
  • qemu_xen.ga
  • qemu_xen_4_17
  • qemu_xen_4_17.debug
  • qemu_xen_4_17.ga
  • qemu_xen_4_18
  • qemu_xen_4_18.debug
  • qemu_xen_4_18.ga
  • xen-guest-agent
  • xen-slim
  • xen-slim.boot
  • xen-slim.dev
  • xen-slim.doc
  • xen-slim.man
  • xenPackages.xen_4_17-slim
  • xenPackages.xen_4_17-slim.boot
  • xenPackages.xen_4_17-slim.dev
  • xenPackages.xen_4_17-slim.doc
  • xenPackages.xen_4_17-slim.man
  • xenPackages.xen_4_18-slim
  • xenPackages.xen_4_18-slim.boot
  • xenPackages.xen_4_18-slim.dev
  • xenPackages.xen_4_18-slim.doc
  • xenPackages.xen_4_18-slim.man

This resolves the spurious 'directory not found' errors in the xen-slim
builds.

Signed-off-by: Fernando Rodrigues <[email protected]>
@emilazy emilazy merged commit 0f3ce17 into NixOS:master Sep 19, 2024
25 of 27 checks passed
@SigmaSquadron SigmaSquadron deleted the xen-more-code-quality branch September 19, 2024 20:06
@SigmaSquadron
Copy link
Contributor Author

Part II: #343111

@SigmaSquadron SigmaSquadron added the 6.topic: xen-project The Xen Project hypervisor label Sep 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: xen-project The Xen Project hypervisor 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants