From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 16 Jan 2024 13:37:51 +0000 (+0100)
Subject: Fix shim signing bug
X-Git-Tag: v20.2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1713beba1ae3504bc32025a90be549f948b086df;p=thirdparty%2Fmkosi.git

Fix shim signing bug

sign_efi_binary() expects the full output path.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 4264fef7e..331cffcd6 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -963,6 +963,9 @@ def find_and_install_shim_binary(
                     continue
 
                 rel = p.relative_to(context.root)
+                if (context.root / output).is_dir():
+                    output /= rel.name
+
                 log_step(f"Installing signed {name} EFI binary from /{rel} to /{output}")
                 shutil.copy2(p, context.root / output)
                 return
@@ -977,6 +980,9 @@ def find_and_install_shim_binary(
                     continue
 
                 rel = p.relative_to(context.root)
+                if (context.root / output).is_dir():
+                    output /= rel.name
+
                 if context.config.secure_boot:
                     log_step(f"Signing and installing unsigned {name} EFI binary from /{rel} to /{output}")
                     sign_efi_binary(context, p, context.root / output)