From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 24 Feb 2023 12:32:39 +0000 (+0100)
Subject: Drop split usr support from gen_kernel_images()
X-Git-Tag: v15~314^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02ff99166e5d8567bfe940f1ffdada272e41bf52;p=thirdparty%2Fmkosi.git

Drop split usr support from gen_kernel_images()
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index bfed8d520..7bcabea05 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -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
     ):