From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 17 May 2022 13:57:32 +0000 (+0200)
Subject: Add two more OVMF code locations
X-Git-Tag: v13~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78c8b58a1f068049455fe24f582b713653f9502e;p=thirdparty%2Fmkosi.git

Add two more OVMF code locations

Used on Ubuntu. Should make sure we find the secure boot OVMF stuff
on Github Actions.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 9a25608d6..d620f113c 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -7644,6 +7644,7 @@ def find_qemu_firmware() -> Tuple[Path, bool]:
         "/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd",  # GENTOO:
         "/usr/share/qemu/OVMF_CODE.secboot.fd",
         "/usr/share/ovmf/OVMF.secboot.fd",
+        "/usr/share/OVMF/OVMF_CODE.secboot.fd",
     ]
 
     for firmware in FIRMWARE_LOCATIONS:
@@ -7670,6 +7671,7 @@ def find_qemu_firmware() -> Tuple[Path, bool]:
         "/usr/share/edk2-ovmf/OVMF_CODE.fd",  # GENTOO:
         "/usr/share/qemu/OVMF_CODE.fd",
         "/usr/share/ovmf/OVMF.fd",
+        "/usr/share/OVMF/OVMF_CODE.fd",
     ]
 
     for firmware in FIRMWARE_LOCATIONS:
@@ -7690,7 +7692,8 @@ def find_ovmf_vars() -> Path:
     OVMF_VARS_LOCATIONS += ["/usr/share/edk2/ovmf/OVMF_VARS.fd",
                             "/usr/share/edk2-ovmf/OVMF_VARS.fd",  # GENTOO:
                             "/usr/share/qemu/OVMF_VARS.fd",
-                            "/usr/share/ovmf/OVMF_VARS.fd"]
+                            "/usr/share/ovmf/OVMF_VARS.fd",
+                            "/usr/share/OVMF/OVMF_VARS.fd"]
 
     for location in OVMF_VARS_LOCATIONS:
         if os.path.exists(location):