|
 |
d0ea73 |
From 21cf4aaafb6088168d2f5c679477644c19116f3d Mon Sep 17 00:00:00 2001
|
|
|
d0ea73 |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
d0ea73 |
Date: Fri, 20 Apr 2018 15:27:04 +0200
|
|
|
d0ea73 |
Subject: [PATCH] uefi: remove last references to kraxel's old edk2 builds
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Commit 889386f8c6088e57fd68f2bb6bf85f69ecfc6f6c removed most of them
|
|
|
d0ea73 |
already, so remove the last ones, and the supporting code.
|
|
|
d0ea73 |
---
|
|
|
d0ea73 |
generator/UEFI.ml | 6 ------
|
|
|
d0ea73 |
v2v/utils.ml | 1 -
|
|
|
d0ea73 |
2 files changed, 7 deletions(-)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
diff --git a/generator/UEFI.ml b/generator/UEFI.ml
|
|
|
d0ea73 |
index daa78bdc9..bca3fa1ae 100644
|
|
|
d0ea73 |
--- a/generator/UEFI.ml
|
|
|
d0ea73 |
+++ b/generator/UEFI.ml
|
|
|
d0ea73 |
@@ -30,12 +30,6 @@ open Docstrings
|
|
|
d0ea73 |
|
|
|
d0ea73 |
(* Order is significant *within architectures only*. *)
|
|
|
d0ea73 |
let firmware = [
|
|
|
d0ea73 |
- "i386",
|
|
|
d0ea73 |
- "/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd",
|
|
|
d0ea73 |
- None,
|
|
|
d0ea73 |
- "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd",
|
|
|
d0ea73 |
- [];
|
|
|
d0ea73 |
-
|
|
|
d0ea73 |
"x86_64",
|
|
|
d0ea73 |
"/usr/share/OVMF/OVMF_CODE.fd",
|
|
|
d0ea73 |
None,
|
|
|
d0ea73 |
diff --git a/v2v/utils.ml b/v2v/utils.ml
|
|
|
d0ea73 |
index e880001eb..67e2028f3 100644
|
|
|
d0ea73 |
--- a/v2v/utils.ml
|
|
|
d0ea73 |
+++ b/v2v/utils.ml
|
|
|
d0ea73 |
@@ -64,7 +64,6 @@ let find_uefi_firmware guest_arch =
|
|
|
d0ea73 |
let files =
|
|
|
d0ea73 |
(* The lists of firmware are actually defined in common/utils/uefi.c. *)
|
|
|
d0ea73 |
match guest_arch with
|
|
|
d0ea73 |
- | "i386" | "i486" | "i586" | "i686" -> Uefi.uefi_i386_firmware
|
|
|
d0ea73 |
| "x86_64" -> Uefi.uefi_x86_64_firmware
|
|
|
d0ea73 |
| "aarch64" -> Uefi.uefi_aarch64_firmware
|
|
|
d0ea73 |
| arch ->
|
|
|
d0ea73 |
--
|
|
 |
6b9fda |
2.21.0
|
|
|
d0ea73 |
|