]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Fix relative path calculation in filter_kernel_modules()
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sat, 14 Sep 2024 14:48:34 +0000 (16:48 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 16 Sep 2024 14:05:49 +0000 (16:05 +0200)
I'm not sure what possessed me when I last touched this, but to get
the path relative to the kernel/ directory we have to strip of the
first 5 parts, not just 1.

mkosi/kmod.py

index eb007dc96ee39c988698af80e1703a43bd39b002..9e38b4a78fbec8f2449857c3268d10b07367778d 100644 (file)
@@ -27,7 +27,7 @@ def filter_kernel_modules(root: Path, kver: str, *, include: Iterable[str], excl
     if include:
         regex = re.compile("|".join(include))
         for m in modules:
-            rel = os.fspath(Path(*m.parts[1:]))
+            rel = os.fspath(Path(*m.parts[5:]))
             if regex.search(rel):
                 keep.add(rel)
 
@@ -35,7 +35,7 @@ def filter_kernel_modules(root: Path, kver: str, *, include: Iterable[str], excl
         remove = set()
         regex = re.compile("|".join(exclude))
         for m in modules:
-            rel = os.fspath(Path(*m.parts[1:]))
+            rel = os.fspath(Path(*m.parts[5:]))
             if rel not in keep and regex.search(rel):
                 remove.add(m)