From: Daan De Meyer Date: Wed, 3 Jan 2024 08:01:54 +0000 (+0100) Subject: Add more ovmf locations X-Git-Tag: v20~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fecc1cfe1e36c54a00f0c35f480ebb5c054ab01;p=thirdparty%2Fmkosi.git Add more ovmf locations debian removed their old variables in favor of new ones so let's make sure we look for the new ones as well. --- diff --git a/mkosi/qemu.py b/mkosi/qemu.py index 83428c9c0..328bc4bc1 100644 --- a/mkosi/qemu.py +++ b/mkosi/qemu.py @@ -204,6 +204,7 @@ def find_ovmf_firmware(config: MkosiConfig) -> tuple[Path, bool]: "/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd", "/usr/share/qemu/OVMF_CODE.secboot.fd", "/usr/share/ovmf/OVMF.secboot.fd", + "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd", "/usr/share/OVMF/OVMF_CODE.secboot.fd", ] @@ -216,6 +217,7 @@ def find_ovmf_firmware(config: MkosiConfig) -> tuple[Path, bool]: "/usr/share/edk2-ovmf/OVMF_CODE.fd", "/usr/share/qemu/OVMF_CODE.fd", "/usr/share/ovmf/OVMF.fd", + "/usr/share/OVMF/OVMF_CODE_4M.fd", "/usr/share/OVMF/OVMF_CODE.fd", ] @@ -246,11 +248,14 @@ def find_ovmf_vars(config: MkosiConfig) -> Path: elif config.architecture == Architecture.arm64: OVMF_VARS_LOCATIONS += ["/usr/share/AAVMF/AAVMF_VARS.fd"] - OVMF_VARS_LOCATIONS += ["/usr/share/edk2/ovmf/OVMF_VARS.fd", - "/usr/share/edk2-ovmf/OVMF_VARS.fd", - "/usr/share/qemu/OVMF_VARS.fd", - "/usr/share/ovmf/OVMF_VARS.fd", - "/usr/share/OVMF/OVMF_VARS.fd"] + OVMF_VARS_LOCATIONS += [ + "/usr/share/edk2/ovmf/OVMF_VARS.fd", + "/usr/share/edk2-ovmf/OVMF_VARS.fd", + "/usr/share/qemu/OVMF_VARS.fd", + "/usr/share/ovmf/OVMF_VARS.fd", + "/usr/share/OVMF/OVMF_VARS_4M.fd", + "/usr/share/OVMF/OVMF_VARS.fd", + ] for location in OVMF_VARS_LOCATIONS: if os.path.exists(location):