From 8fb7f81181a566fac5ee572ee630946294f735ff Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 30 Apr 2015 17:20:26 -0400 Subject: [PATCH] RHEL 7: v2v: efi: Remove references to Fedora / kraxel's OVMF packages. --- generator/UEFI.ml | 6 ------ v2v/utils.ml | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/generator/UEFI.ml b/generator/UEFI.ml index 95797aa..881009c 100644 --- a/generator/UEFI.ml +++ b/generator/UEFI.ml @@ -30,12 +30,6 @@ open Docstrings (* Order is significant *within architectures only*. *) let firmware = [ - "i386", - "/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd", - None, - "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd", - []; - "x86_64", "/usr/share/OVMF/OVMF_CODE.fd", None, diff --git a/v2v/utils.ml b/v2v/utils.ml index 8f1053e..212c8a0 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -54,7 +54,6 @@ let find_uefi_firmware guest_arch = let files = (* The lists of firmware are actually defined in common/utils/uefi.c. *) match guest_arch with - | "i386" | "i486" | "i586" | "i686" -> Uefi.uefi_i386_firmware | "x86_64" -> Uefi.uefi_x86_64_firmware | "aarch64" -> Uefi.uefi_aarch64_firmware | arch -> @@ -62,7 +61,7 @@ let find_uefi_firmware guest_arch = guest_arch in let rec loop = function | [] -> - error (f_"cannot find firmware for UEFI guests.\n\nYou probably need to install OVMF, or Gerd's firmware repo (https://www.kraxel.org/repos/), or AAVMF (if using aarch64)") + error (f_"cannot find firmware for UEFI guests.\n\nYou probably need to install OVMF, or AAVMF (if using aarch64)") | ({ Uefi.code = code; vars = vars_template } as ret) :: rest -> if Sys.file_exists code && Sys.file_exists vars_template then ret else loop rest -- 2.9.4