From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 19 Mar 2025 14:24:31 +0000 (+0100)
Subject: kmod: Fix exclusion via glob in filter_firmware()
X-Git-Tag: v26~310^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4874e730e6919c3bb1417a59331f6aee6d60c18a;p=thirdparty%2Fmkosi.git

kmod: Fix exclusion via glob in filter_firmware()

We have to remove firmware if it "doesn't" match, not if it matches.
---

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index 11e2b22da..1bab029a1 100644
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -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