third_party/edk2: use toolchain-bundle for edk2 build
This moves the build into a custom rule instead of a genrule.
This also adds the AARCH64 build and renames the files to be more
generic
Change-Id: If6e3cecaf4011e2e39f13b1d40bcc7060cee3afb
Reviewed-on: https://review.monogon.dev/c/monogon/+/4154
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/test/launch/BUILD.bazel b/metropolis/test/launch/BUILD.bazel
index c03da7d..b2530c5 100644
--- a/metropolis/test/launch/BUILD.bazel
+++ b/metropolis/test/launch/BUILD.bazel
@@ -20,8 +20,8 @@
"//metropolis/test/swtpm/certtool",
"//metropolis/test/swtpm/swtpm_cert",
"//osbase/test/ktest:linux-testing",
- "//third_party/edk2:OVMF_CODE.fd",
- "//third_party/edk2:OVMF_VARS.fd",
+ "//third_party/edk2:CODE.fd",
+ "//third_party/edk2:VARS.fd",
"@swtpm",
"@swtpm//:swtpm_localca",
"@swtpm//:swtpm_setup",
@@ -35,8 +35,8 @@
"xSwtpmCertPath": "$(rlocationpath //metropolis/test/swtpm/swtpm_cert )",
"xCerttoolPath": "$(rlocationpath //metropolis/test/swtpm/certtool )",
"xMetroctlPath": "$(rlocationpath //metropolis/cli/metroctl:metroctl_lite )",
- "xOvmfVarsPath": "$(rlocationpath //third_party/edk2:OVMF_VARS.fd )",
- "xOvmfCodePath": "$(rlocationpath //third_party/edk2:OVMF_CODE.fd )",
+ "xOvmfVarsPath": "$(rlocationpath //third_party/edk2:VARS.fd )",
+ "xOvmfCodePath": "$(rlocationpath //third_party/edk2:CODE.fd )",
"xKernelPath": "$(rlocationpath //osbase/test/ktest:linux-testing )",
"xInitramfsPath": "$(rlocationpath //metropolis/test/nanoswitch:initramfs )",
"xNodeImagePath": "$(rlocationpath //metropolis/node:oci_image_uncompressed )",
diff --git a/metropolis/test/launch/cluster.go b/metropolis/test/launch/cluster.go
index d2bbb4b..af15564 100644
--- a/metropolis/test/launch/cluster.go
+++ b/metropolis/test/launch/cluster.go
@@ -322,7 +322,7 @@
}
tpmSocketPath := filepath.Join(r.sd, "tpm-socket")
- fwVarPath := filepath.Join(r.ld, "OVMF_VARS.fd")
+ fwVarPath := filepath.Join(r.ld, "VARS.fd")
storagePath := filepath.Join(r.ld, "image.img")
qemuArgs := []string{
"-machine", "q35",