xen: code quality updates and generic patch deduplication#333948
Merged
Conversation
SigmaSquadron
force-pushed
the
xen-drop-figs
branch
3 times, most recently
from
079c890 to
0d0cf4d
Compare
SigmaSquadron
added
2.status: work-in-progress
11.by: package-maintainer
This comment was marked as outdated.
This comment was marked as outdated.
5 tasks
SigmaSquadron
force-pushed
the
xen-drop-figs
branch
from
0d0cf4d to
c6490ba
Compare
ofborg
Bot
added
8.has: clean-up
emilazy
requested changes
Aug 11, 2024
emilazy
left a comment
emilazy
left a comment
Member
There was a problem hiding this comment.
Haven’t done a proper review yet, just a drive‐by suggestion.
SigmaSquadron
force-pushed
the
xen-drop-figs
branch
from
c6490ba to
e18d104
Compare
SigmaSquadron
force-pushed
the
xen-drop-figs
branch
2 times, most recently
from
a8facbd to
05f5708
Compare
Contributor
Author
|
Once more, do let me know which commits should be squashed. |
SigmaSquadron
force-pushed
the
xen-drop-figs
branch
3 times, most recently
from
35e10e5 to
93c8587
Compare
emilazy
approved these changes
Aug 21, 2024
emilazy
left a comment
emilazy
left a comment
Member
There was a problem hiding this comment.
Great stuff as always! As ever, I don’t have the means to test this myself, but have read over the commits and checked the build. I have left some comments, but most are merely informative and none are at all blocking, so please do ping me in a day or so if I haven’t merged this regardless of any action on or response to them.
I don’t really feel any of these commits would be better squashed. Thank you for making well‐factored PRs that are easy to review commit‐by‐commit.
Result of nixpkgs-review pr 333948 run on x86_64-linux 1
2 packages marked as broken and skipped:
- libvmi
- qubes-core-vchan-xen
53 packages built:
- qemu_xen (qemu_xen_4_19)
- qemu_xen.debug (qemu_xen_4_19.debug)
- qemu_xen.ga (qemu_xen_4_19.ga)
- qemu_xen_4_16
- qemu_xen_4_16.debug
- qemu_xen_4_16.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 (xenPackages.xen_4_19)
- xen-guest-agent
- xen-slim (xenPackages.xen_4_19-slim)
- xen-slim.boot (xenPackages.xen_4_19-slim.boot)
- xen-slim.dev (xenPackages.xen_4_19-slim.dev)
- xen-slim.doc (xenPackages.xen_4_19-slim.doc)
- xen-slim.man (xenPackages.xen_4_19-slim.man)
- xen.boot (xenPackages.xen_4_19.boot)
- xen.dev (xenPackages.xen_4_19.dev)
- xen.doc (xenPackages.xen_4_19.doc)
- xen.man (xenPackages.xen_4_19.man)
- xenPackages.xen_4_16
- xenPackages.xen_4_16-slim
- xenPackages.xen_4_16-slim.boot
- xenPackages.xen_4_16-slim.dev
- xenPackages.xen_4_16-slim.doc
- xenPackages.xen_4_16-slim.man
- xenPackages.xen_4_16.boot
- xenPackages.xen_4_16.dev
- xenPackages.xen_4_16.doc
- xenPackages.xen_4_16.man
- xenPackages.xen_4_17
- 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_17.boot
- xenPackages.xen_4_17.dev
- xenPackages.xen_4_17.doc
- xenPackages.xen_4_17.man
- xenPackages.xen_4_18
- 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
- xenPackages.xen_4_18.boot
- xenPackages.xen_4_18.dev
- xenPackages.xen_4_18.doc
- xenPackages.xen_4_18.man
SigmaSquadron
commented
Aug 21, 2024
wegank
added
the
12.approvals: 1
Most patches used in the Xen build are generic, so let's keep everything that applies to all versions in one folder. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
There is no point in having both. The top-level package now points directly to the latest version. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
This is useful for the future when we begin building custom versions of Xen, such as `qubes-vmm-xen`. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
…of going through withTools withTools and withPrefetchedSources are pretty complicated functions meant to generalise per-version calls to build phases by each pre-fetched source. This is step 1 in deprecating them. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
From the 4.19 release notes: When building with Systemd support (./configure --enable-systemd), remove libsystemd as a build dependency. Systemd Notify support is retained, now using a standalone library implementation. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
We were still building some minor parts of qemu-traditional by not disabling it explicitly. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
Flask is disabled by default, but this will save someone an overrideAttrs overlay if they're using FLASK. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
From Peder Sundt: > I read maintainers = with lib.maintainers; [ ]; as a friendly open > invitation, while maintainers = [ ]; as a sad state of reality. > I want people to join the project hence I very much prefer the former. I don't plan on leaving anytime soon, but let's not make it more difficult for new maintainers to step up. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
We now use easier to understand functions that are properly documented and aren't as generic. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
XEN_EXTFILES_URL wasn't working back when this override did anything, and now we bypass it entirely. The LD variable was rewritten to use lib.meta.getExe. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
The IPXE patch is the same across all versions. Let us put generic patches in the new generic/ directory. We also disable figs, as they were broken. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
For the update script and the one-liner in the README, use flags that do what we want to do instead of piping the output to different commands or using environment variables. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
We use a lot of pipes, so it's good to exit if any of the dependent commands fail. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
Use `with upstreamPatches;` instead. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
This prevents users browsing the package in search.nixos.org from messaging maintainers about an EOL Xen. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
SigmaSquadron
force-pushed
the
xen-drop-figs
branch
from
93c8587 to
70ff32c
Compare
Contributor
Author
|
Gotta love that git rewrites all commits despite the changes only being on like two of those. Fixed the wording in some code comments, and added more documentation for those updating the Xen files. |
Member
|
LGTM; let’s land this, any further improvements can be separate PRs. Cross your fingers for Hydra managing to build everything this time! |
Contributor
Author
|
All builds succeeded! Thank you again for your help, emily. |
Member
|
Any time :) Really happy to see the Xen stuff come together, feel free to ping me for reviews at your leisure. |
SigmaSquadron
added
the
6.topic: xen-project
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
generic.nixand other generic files and patches to their own directory, to not clutter the root directory.See individual commits for a more detailed changelog.
There are many commits in this PR, and they were separated so they could be reviewed more easily. Let me know which ones should be squashed.
Things done
pkg-configtest passes.nix-shell -p nixpkgs-review --run "nixpkgs-review pr 333948". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Effectively reverts #333764 and partially reverts #331867.
Add a 👍 reaction to pull requests you find important.