Use EDK2 firmware instead of Rust Hypervisor Firmware

To work around the lack of arm64 binary[1]. [1]: cloud-hypervisor/rust-hypervisor-firmware#294
cirruslabs · Nov 15, 2023 · 4eb733f · 4eb733f
1 parent f644e25
commit 4eb733f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 46 deletions.
diff --git a/internal/oci/pull/tart/hypervisorfw/hypervisorfw.go b/internal/oci/pull/tart/hypervisorfw/hypervisorfw.go
diff --git a/internal/oci/pull/tart/tart.go b/internal/oci/pull/tart/tart.go
@@ -8,10 +8,10 @@ import (
 	"github.com/cirruslabs/vetu/internal/oci/mediatypes"
 	"github.com/cirruslabs/vetu/internal/oci/pull/pullhelper"
 	"github.com/cirruslabs/vetu/internal/oci/pull/tart/applestream"
-	"github.com/cirruslabs/vetu/internal/oci/pull/tart/hypervisorfw"
 	"github.com/cirruslabs/vetu/internal/oci/pull/tart/tartconfig"
 	"github.com/cirruslabs/vetu/internal/vmconfig"
 	"github.com/cirruslabs/vetu/internal/vmdirectory"
+	cp "github.com/otiai10/copy"
 	"github.com/regclient/regclient"
 	"github.com/regclient/regclient/types"
 	manifestpkg "github.com/regclient/regclient/types/manifest"
@@ -78,11 +78,11 @@ func PullVMDirectory(
 		return err
 	}
 
-	// Download latest Hypervisor Firmware since
+	// Copy latest Hypervisor Firmware since
 	// Tart VM images have no separate kernel
-	fmt.Println("downloading latest Hypervisor Firmware...")
+	fmt.Println("copying EDK2 firmware to use as a kernel...")
 
-	if err := hypervisorfw.Fetch(ctx, vmDir.KernelPath()); err != nil {
+	if err := cp.Copy("/usr/share/cloud-hypervisor/CLOUDHV_EFI.fd", vmDir.KernelPath()); err != nil {
 		return err
 	}