Skip to content

Commit e3b83d4

Browse files
committed
xen: fix IPXE sourcing
`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 <[email protected]> Signed-off-by: Fernando Rodrigues <[email protected]>
1 parent 1200719 commit e3b83d4

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

pkgs/build-support/xen/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: {
265265
"--with-system-qemu"
266266
(if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios")
267267
(if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf")
268-
(if withIPXE then "--with-system-ipxe=${ipxe}" else "--disable-ipxe")
268+
(if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe")
269269
(enableFeature withFlask "xsmpolicy")
270270
];
271271

pkgs/by-name/ip/ipxe/package.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
embedScript ? null,
1515
additionalTargets ? { },
1616
additionalOptions ? [ ],
17+
firmwareBinary ? "ipxe.efirom",
1718
}:
1819

1920
let
@@ -130,8 +131,11 @@ stdenv.mkDerivation (finalAttrs: {
130131

131132
enableParallelBuilding = true;
132133

133-
passthru.updateScript = unstableGitUpdater {
134-
tagPrefix = "v";
134+
passthru = {
135+
firmware = "${finalAttrs.finalPackage}/${firmwareBinary}";
136+
updateScript = unstableGitUpdater {
137+
tagPrefix = "v";
138+
};
135139
};
136140

137141
meta = {

0 commit comments

Comments
 (0)