From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 24 Oct 2023 12:47:07 +0000 (+0200)
Subject: Skip missing kernel images in gen_kernel_images()
X-Git-Tag: v19~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bed820d8139fbb6a17dce547e0ae849dfdf982ee;p=thirdparty%2Fmkosi.git

Skip missing kernel images in gen_kernel_images()

And copy out the vmlinuz unconditionally again in copy_vmlinuz().
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0091a98f7..84c2589b1 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1054,6 +1054,9 @@ def gen_kernel_images(state: MkosiState) -> Iterator[tuple[str, Path]]:
         key=lambda k: GenericVersion(k.name),
         reverse=True
     ):
+        if not (kver / "vmlinuz").exists():
+            continue
+
         yield kver.name, Path("usr/lib/modules") / kver.name / "vmlinuz"
 
 
@@ -1409,9 +1412,6 @@ def copy_nspawn_settings(state: MkosiState) -> None:
 
 
 def copy_vmlinuz(state: MkosiState) -> None:
-    if state.config.bootable == ConfigFeature.disabled:
-        return
-
     if (state.staging / state.config.output_split_kernel).exists():
         return