tests: downgrade from edk2 202308 to 202305

This commit is contained in:
Julian Stecklina 2023-10-19 19:24:25 +02:00
parent 0c7ca2b180
commit 65003165c8
1 changed files with 29 additions and 6 deletions

View File

@ -86,8 +86,7 @@ let
${testScript} ${testScript}
''; '';
nodes.machine = { pkgs, lib, ... }: {
nodes.machine = { lib, ... }: {
imports = [ imports = [
lanzabooteModule lanzabooteModule
machine machine
@ -97,11 +96,35 @@ let
useBootLoader = true; useBootLoader = true;
useEFIBoot = true; useEFIBoot = true;
efi.OVMF = pkgs.OVMF.override { # We actually only want to enable features in OVMF, but at
secureBoot = useSecureBoot; # the moment edk2 202308 is also broken. So we downgrade it
tpmSupport = useTPM2; # This is needed otherwise OVMF won't initialize the TPM2 protocol. # here as well. How painful!
#
# See #240.
efi.OVMF =
let
edk2Version = "202305";
edk2Src = pkgs.fetchFromGitHub {
owner = "tianocore";
repo = "edk2";
rev = "edk2-stable${edk2Version}";
fetchSubmodules = true;
hash = "sha256-htOvV43Hw5K05g0SF3po69HncLyma3BtgpqYSdzRG4s=";
}; };
edk2 = pkgs.edk2.overrideAttrs (old: rec {
version = edk2Version;
src = edk2Src;
});
in
(pkgs.OVMF.override {
secureBoot = useSecureBoot;
tpmSupport = useTPM2; # This is needed otherwise OVMF won't initialize the TPM2 protocol.
edk2 = edk2;
}).overrideAttrs (old: {
src = edk2Src;
});
qemu.options = lib.mkIf useTPM2 [ qemu.options = lib.mkIf useTPM2 [
"-chardev socket,id=chrtpm,path=${tpmSocketPath}" "-chardev socket,id=chrtpm,path=${tpmSocketPath}"