Fix shim signing bug

sign_efi_binary() expects the full output path.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 4264fef7e25b27a538d4720dc30fac28725e9c9e..331cffcd6cdafbcd3282116b7325d7b1781765b4 100644 (file)
--- 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)