From 4449e2ac20e70e85533ce0bd38d53b9980a49cb5 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. --- src/utils.c | 12 ------------ v2v/utils.ml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/utils.c b/src/utils.c index dbb9a44..8ffc1ed 100644 --- a/src/utils.c +++ b/src/utils.c @@ -324,9 +324,6 @@ guestfs_int_is_true (const char *str) /* See src/appliance.c:guestfs_int_get_uefi. */ const char * guestfs_int_ovmf_i386_firmware[] = { - "/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd", - "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd", - NULL }; @@ -335,12 +332,6 @@ guestfs_int_ovmf_x86_64_firmware[] = { "/usr/share/OVMF/OVMF_CODE.fd", "/usr/share/OVMF/OVMF_VARS.fd", - "/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd", - "/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd", - - "/usr/share/qemu/ovmf-x86_64-code.bin", - "/usr/share/qemu/ovmf-x86_64-vars.bin", - NULL }; @@ -349,9 +340,6 @@ guestfs_int_aavmf_firmware[] = { "/usr/share/AAVMF/AAVMF_CODE.fd", "/usr/share/AAVMF/AAVMF_VARS.fd", - "/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw", - "/usr/share/edk2.git/aarch64/vars-template-pflash.raw", - NULL }; diff --git a/v2v/utils.ml b/v2v/utils.ml index 898b8d4..d88f8ad 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -99,7 +99,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)") | ((code, vars_template) as ret) :: rest -> if Sys.file_exists code && Sys.file_exists vars_template then ret else loop rest -- 1.8.3.1