diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-05-18 12:46:14 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-05-20 12:33:48 +0200 |
| commit | 252dcd62f39ec9163832805dd41286c75f802530 (patch) | |
| tree | 34c016bd538bcb4d45403f6cacef7440e74889c8 /nixos/tests | |
| parent | e000fb05dba84ea28dc3edaa3ad664b4a2500f29 (diff) | |
OVMF: separate output for ovmf binaries
OVMF{,CODE,VARS}.fd are now available in a dedicated fd output, greatly
reducing the closure in the common case where only those files are used (a
few MBs versus several hundred MBs for the full OVMF).
Note: it's unclear why `dontPatchELF` is now necessary for the build to
pass (on my end, at any rate) but it doesn't make much sense to run this
fixup anyway,
Note: my reading of xen's INSTALL suggests that --with-system-ovmf should
point directly to the OVMF binary. As such, the previous invocation was
incorrect (it pointed to the root of the OVMF tree). In any case, I have
only built xen with `--with-system-ovmf`, I have not tested it.
Fixes https://github.com/NixOS/nixpkgs/issues/25854
Closes https://github.com/NixOS/nixpkgs/pull/25855
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/boot.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 3ea0df65c8b5a..69ab4755e4447 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -40,12 +40,12 @@ in { uefiCdrom = makeBootTest "uefi-cdrom" '' cdrom => glob("${iso}/iso/*.iso"), - bios => '${pkgs.OVMF}/FV/OVMF.fd' + bios => '${pkgs.OVMF.fd}/FV/OVMF.fd' ''; uefiUsb = makeBootTest "uefi-usb" '' usb => glob("${iso}/iso/*.iso"), - bios => '${pkgs.OVMF}/FV/OVMF.fd' + bios => '${pkgs.OVMF.fd}/FV/OVMF.fd' ''; netboot = let diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3ab3c1bac48ae..6dce6f407cda9 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -63,7 +63,7 @@ let (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + (optionalString (system == "x86_64-linux") "-cpu kvm64 "); hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '' - + optionalString (bootLoader == "systemd-boot") ''bios => "${pkgs.OVMF}/FV/OVMF.fd", ''; + + optionalString (bootLoader == "systemd-boot") ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", ''; in '' $machine->start; |