nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: fix IPXE sourcing

Browse Source 
`xl` needs a full path to the efirom executable.
This does not fix the qemu-dm issue. A stubdom is still required.

Reported-by: HeHongbo <hehongbo@mail.com>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
This commit is contained in:
Fernando Rodrigues 2024-11-12 21:51:59 +00:00
parent 1200719b87
commit e3b83d4525
No known key found for this signature in database
GPG Key ID: CC3AE2EA00000000
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/xen/default.nix
View File

@ -265,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-system-qemu" "--with-system-qemu"
(if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios") (if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios")
(if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf") (if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf")
(if withIPXE then "--with-system-ipxe=${ipxe}" else "--disable-ipxe") (if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe")
(enableFeature withFlask "xsmpolicy") (enableFeature withFlask "xsmpolicy")
]; ];

8
pkgs/by-name/ip/ipxe/package.nix
View File

@ -14,6 +14,7 @@
embedScript ? null, embedScript ? null,
additionalTargets ? { }, additionalTargets ? { },
additionalOptions ? [ ], additionalOptions ? [ ],
firmwareBinary ? "ipxe.efirom",
}: }:
let let
@ -130,8 +131,11 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = unstableGitUpdater { passthru = {
tagPrefix = "v"; firmware = "${finalAttrs.finalPackage}/${firmwareBinary}";
updateScript = unstableGitUpdater {
tagPrefix = "v";
};
}; };
meta = { meta = {