]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
kmod: Fix exclusion via glob in filter_firmware()
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 19 Mar 2025 14:24:31 +0000 (15:24 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 19 Mar 2025 14:24:31 +0000 (15:24 +0100)
We have to remove firmware if it "doesn't" match, not if it matches.

mkosi/kmod.py

index 11e2b22da1b7c639fdaaa5e8b5ed4d9cbc36c7a0..1bab029a1d441f21f379d02696106963375c6477 100644 (file)
@@ -157,7 +157,7 @@ def filter_firmware(
 
         for f in firmware:
             rel = os.fspath(Path(*f.parts[3:]))
-            if (patterns and regex.search(rel)) or globs_match_firmware(rel, globs, match_default=True):
+            if (patterns and regex.search(rel)) or not globs_match_firmware(rel, globs, match_default=True):
                 remove.add(f)
 
         firmware -= remove