-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
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
qubes-vmm-xen: init at 4.19.0-5, qubes-seabios: init at 4.0.2 #341429
base: master
Are you sure you want to change the base?
Conversation
TODO:
|
1c8d990
to
a2374ef
Compare
9acc181
to
af27cd3
Compare
Changing it to I'm not sure if that's qubes changes, or system seabios flag is broken in xen derivation itself. Interestingly, in qubes, this directory is populated with EDIT: Nvm, I think current behavior is correct, I'll provide fixes and qubes-seabios package in my PR. |
In qubes-packages PR I fix that by using --- a/pkgs/by-name/qu/qubes-vmm-xen/package.nix
+++ b/pkgs/by-name/qu/qubes-vmm-xen/package.nix
@@ -11,7 +11,9 @@
let
pname = "qubes-vmm-xen";
branch = "4.19";
- version = "4.19.0-3";
+ versionPatches = "4.19.0";
+ versionSuffix = "3";
+ version = "${versionPatches}-${versionSuffix}";
latest = true;
xenPatches = import ../../../applications/virtualization/xen/generic/patches.nix {
@@ -43,7 +45,7 @@ let
python = python311;
in
-callPackage
+(callPackage
(import ../../../applications/virtualization/xen/generic/default.nix {
inherit
pname
@@ -108,3 +110,8 @@ callPackage
}
// genericDefinition
)
+).overrideAttrs (oldAttrs: {
+ passthru = oldAttrs.passthru // {
+ efi = "boot/xen-${versionPatches}.efi"
+ };
+}) |
oops. fixed. |
06d5bea
to
40ce3b9
Compare
I believe seabios comment is relevant after all. In my qubes branch, I was only able to use Xen with this argument specified: |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
The label works! |
41ee564
to
2eb7eb1
Compare
Cool, it works! This can be merged as soon as the by-name PR is ready. |
2eb7eb1
to
3741474
Compare
@CertainLach make the necessary changes to the generic builder in your branch; doing them here before #342692 is merged would break Xen's eval. |
); | ||
in | ||
|
||
buildXenPackage.override |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For Qubes, I also add overrideAttrs with installPhase to copy qubes-vmm-stubdom binaries here, any idea on how to perform this operation in a cleaner maner?
Maybe an extra postInstall
builder argument?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
qubes-vmm-xen also needs a corresponding python module
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Feel free to pick CertainLach@9f6e6ce for python module.
Co-authored-by: Fernando Rodrigues <[email protected]>
3741474
to
4cccf4e
Compare
The first (and hopefully the last) custom Xen to be built based on the generic Xen builder. It's just a standard build of Xen with a lot of patches. Signed-off-by: Fernando Rodrigues <[email protected]>
4cccf4e
to
41c70df
Compare
Signed-off-by: Fernando Rodrigues <[email protected]>
41c70df
to
b2f63b4
Compare
b2f63b4
to
49093fe
Compare
yeeeeah, nope. stubdom-bin it is. i get it why you decided to just unpack the RPM, not to mention that the kernel team will be very unhappy if we sneak in another Linux build here. |
Stubdom also depends on some qubes packages, and I have found a nasty dependency loop here too. |
Description of changes
The first (and hopefully the last) custom Xen to be built based on the generic Xen builder. It's just a standard build of Xen with a lot of patches.
Compliments #341215.
Depends on #345192, #345324 and #342692.
Fixes #340544.
Things done
nix-shell -p nixpkgs-review --run "nixpkgs-review pr 341429"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)cc @CertainLach
Add a 👍 reaction to pull requests you find important.