From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 30 Apr 2024 13:25:34 +0000 (+0200)
Subject: Don't look for firmware in /etc/qemu/firmware if we're using a tools tree
X-Git-Tag: v23.1~82^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e71b5ec05d4eb9c8b064c0589f1df163e7c7239;p=thirdparty%2Fmkosi.git

Don't look for firmware in /etc/qemu/firmware if we're using a tools tree

This is unlikely to work properly since the description in /etc/qemu/firmware
will assume the host's /usr is in place and not the tools tree's /usr.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 2a26aeb13..8fc232c04 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -45,7 +45,7 @@ from mkosi.sandbox import Mount
 from mkosi.tree import copy_tree, rmtree
 from mkosi.types import PathString
 from mkosi.user import INVOKING_USER, become_root
-from mkosi.util import StrEnum, flatten, flock, flock_or_die, try_or
+from mkosi.util import StrEnum, flock, flock_or_die, try_or
 from mkosi.versioncomp import GenericVersion
 
 QEMU_KVM_DEVICE_VERSION = GenericVersion("9.0")
@@ -189,13 +189,9 @@ def find_ovmf_firmware(config: Config, firmware: QemuFirmware) -> Optional[OvmfC
     if not firmware.is_uefi():
         return None
 
-    desc = flatten(
-        p.glob("*")
-        for p in (
-            config.tools() / "etc/qemu/firmware",
-            config.tools() / "usr/share/qemu/firmware",
-        )
-    )
+    desc = list((config.tools() / "usr/share/qemu/firmware").glob("*"))
+    if config.tools() == Path("/"):
+        desc += list((config.tools() / "etc/qemu/firmware").glob("*"))
 
     arch = config.architecture.to_qemu()
     machine = config.architecture.default_qemu_machine()