]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Drop split usr support from gen_kernel_images()
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 24 Feb 2023 12:32:39 +0000 (13:32 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 24 Feb 2023 12:32:57 +0000 (13:32 +0100)
mkosi/__init__.py

index bfed8d5202d1801beb2a97b89202c537c6c03cc2..7bcabea05fa2b902daa4acb9a0af0639ea306464 100644 (file)
@@ -757,12 +757,11 @@ def make_directory(state: MkosiState) -> None:
 
 
 def gen_kernel_images(state: MkosiState) -> Iterator[tuple[str, Path]]:
-    # Apparently openmandriva hasn't yet completed its usrmerge so we use lib here instead of usr/lib.
-    if not state.root.joinpath("lib/modules").exists():
+    if not state.root.joinpath("usr/lib/modules").exists():
         return
 
     for kver in sorted(
-        (k for k in state.root.joinpath("lib/modules").iterdir() if k.is_dir()),
+        (k for k in state.root.joinpath("usr/lib/modules").iterdir() if k.is_dir()),
         key=lambda k: GenericVersion(k.name),
         reverse=True
     ):