From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 12 Dec 2023 14:32:47 +0000 (+0100)
Subject: Revert "Look for vmlinuz.efi as well"
X-Git-Tag: v20~73^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff56b3de9fb15b5ddac51251c8a1a7ca5c68181b;p=thirdparty%2Fmkosi.git

Revert "Look for vmlinuz.efi as well"

The kernel install target will install vmlinuz.efi as vmlinuz,
so no need to look for vmlinuz.efi after all.

This reverts commit f3871e3e843cbe28a03175aa14dc060e0ce06897.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 83f7818dc..a5c02695e 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1086,7 +1086,7 @@ def prepare_grub_bios(state: MkosiState, partitions: Sequence[Partition]) -> Non
             kmods = build_kernel_modules_initrd(state, kver)
 
             with umask(~0o600):
-                kimg = Path(shutil.copy2(state.root / kimg, kdst / kimg.name))
+                kimg = Path(shutil.copy2(state.root / kimg, kdst / "vmlinuz"))
                 initrds = [Path(shutil.copy2(microcode, kdst / "microcode"))] if microcode else []
                 initrds += [
                     Path(shutil.copy2(initrd, dst / initrd.name))
@@ -1268,13 +1268,10 @@ def gen_kernel_images(state: MkosiState) -> Iterator[tuple[str, Path]]:
         key=lambda k: GenericVersion(k.name),
         reverse=True
     ):
-        for f in ("vmlinuz", "vmlinuz.efi"):
-            if (kver / f).exists():
-                break
-        else:
+        if not (kver / "vmlinuz").exists():
             continue
 
-        yield kver.name, Path("usr/lib/modules") / kver.name / f
+        yield kver.name, Path("usr/lib/modules") / kver.name / "vmlinuz"
 
 
 def build_initrd(state: MkosiState) -> Path: