From: Daan De Meyer Date: Thu, 21 Dec 2023 13:21:52 +0000 (+0100) Subject: Add opensuse paths to qemu search locations X-Git-Tag: v20~45^2 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2196%2Fhead;p=thirdparty%2Fmkosi.git Add opensuse paths to qemu search locations --- diff --git a/mkosi/qemu.py b/mkosi/qemu.py index dfbeff34e..b220e075f 100644 --- a/mkosi/qemu.py +++ b/mkosi/qemu.py @@ -166,7 +166,10 @@ def find_qemu_binary(config: MkosiConfig) -> str: def find_ovmf_firmware(config: MkosiConfig) -> tuple[Path, bool]: FIRMWARE_LOCATIONS = { - Architecture.x86_64: ["/usr/share/ovmf/x64/OVMF_CODE.secboot.fd"], + Architecture.x86_64: [ + "/usr/share/ovmf/x64/OVMF_CODE.secboot.fd", + "/usr/share/qemu/ovmf-x86_64.smm.bin", + ], Architecture.x86: [ "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd", "/usr/share/OVMF/OVMF32_CODE_4M.secboot.fd" @@ -229,7 +232,10 @@ def find_ovmf_vars(config: MkosiConfig) -> Path: OVMF_VARS_LOCATIONS = [] if config.architecture == Architecture.x86_64: - OVMF_VARS_LOCATIONS += ["/usr/share/ovmf/x64/OVMF_VARS.fd"] + OVMF_VARS_LOCATIONS += [ + "/usr/share/ovmf/x64/OVMF_VARS.fd", + "/usr/share/qemu/ovmf-x86_64-vars.bin", + ] elif config.architecture == Architecture.x86: OVMF_VARS_LOCATIONS += [ "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",