kmod: do not append glob to search for firmware if it is already there

Some kernel modules use globs in their firmware dependencies:

modinfo ath11k_pci
filename:       /lib/modules/6.11.7-amd64/kernel/drivers/net/wireless/ath/ath11k/ath11k_pci.ko.xz
firmware:       ath11k/WCN6855/hw2.1/*
firmware:       ath11k/WCN6855/hw2.0/*
firmware:       ath11k/QCN9074/hw1.0/*
firmware:       ath11k/QCA6390/hw2.0/*

Which means the glob uses a double "**" which breaks it, and the
firmwares are skipped. Do not add a "*" if it is already present in
the search value.

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index 825ca674ce01ddd0f1832d6b3d0aa0c0c95c0c21..91368f5f06b226eb028e29f7f842ee7549397466 100644 (file)
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -106,18 +106,19 @@ def resolve_module_dependencies(
             if not sep:
                 key, sep, value = line.partition("=")
 
+            value = value.strip()
+
             if key == "depends":
-                depends.update(normalize_module_name(d) for d in value.strip().split(",") if d)
+                depends.update(normalize_module_name(d) for d in value.split(",") if d)
 
             elif key == "softdep":
                 # softdep is delimited by spaces and can contain strings like pre: and post: so discard
                 # anything that ends with a colon.
-                depends.update(
-                    normalize_module_name(d) for d in value.strip().split() if not d.endswith(":")
-                )
+                depends.update(normalize_module_name(d) for d in value.split() if not d.endswith(":"))
 
             elif key == "firmware":
-                fw = [f for f in Path("usr/lib/firmware").glob(f"{value.strip()}*")]
+                glob = "" if value.endswith("*") else "*"
+                fw = [f for f in Path("usr/lib/firmware").glob(f"{value}{glob}")]
                 if not fw:
                     logging.debug(f"Not including missing firmware /usr/lib/firmware/{value} in the initrd")
 
@@ -126,7 +127,7 @@ def resolve_module_dependencies(
             elif key == "name":
                 # The file names use dashes, but the module names use underscores. We track the names in
                 # terms of the file names, since the depends use dashes and therefore filenames as well.
-                name = normalize_module_name(value.strip())
+                name = normalize_module_name(value)
 
                 moddep[name] = depends
                 firmwaredep[name] = firmware