Libguestfs - Apr 2018 - [PATCH] uefi: remove last references to kraxel's old edk2 builds

Commit 889386f8c6088e57fd68f2bb6bf85f69ecfc6f6c removed most of them
already, so remove the last ones, and the supporting code.
---
 generator/UEFI.ml | 6 ------
 v2v/utils.ml      | 1 -
 2 files changed, 7 deletions(-)

diff --git a/generator/UEFI.ml b/generator/UEFI.ml
index 5161e28ee..1ff3f84d2 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 58331207f..372ad8aaa 100644
--- a/v2v/utils.ml
+++ b/v2v/utils.ml
@@ -64,7 +64,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 ->
-- 
2.14.3

On Fri, Apr 20, 2018 at 03:30:39PM +0200, Pino Toscano
wrote:
> Commit 889386f8c6088e57fd68f2bb6bf85f69ecfc6f6c removed most of them
> already, so remove the last ones, and the supporting code.
> ---
>  generator/UEFI.ml | 6 ------
>  v2v/utils.ml      | 1 -
>  2 files changed, 7 deletions(-)
> 
> diff --git a/generator/UEFI.ml b/generator/UEFI.ml
> index 5161e28ee..1ff3f84d2 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 58331207f..372ad8aaa 100644
> --- a/v2v/utils.ml
> +++ b/v2v/utils.ml
> @@ -64,7 +64,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 ->
> -- 
> 2.14.3
ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html