Move output_signature in MkosiConfig

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 6ec6c878d6dfd3f460053246eb232df58f5bd1df..eeb5d7ab4823475971e1299946a9f16db090bef2 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -4352,12 +4352,12 @@ def calculate_signature(config: MkosiConfig, state: MkosiState, checksum: Option
     if checksum is None:
         return None
 
-    assert state.output_signature is not None
+    assert config.output_signature is not None
 
     with complete_step("Signing SHA256SUMS…"):
         f: BinaryIO = cast(
             BinaryIO,
-            tempfile.NamedTemporaryFile(mode="wb", prefix=".mkosi-", dir=os.path.dirname(state.output_signature)),
+            tempfile.NamedTemporaryFile(mode="wb", prefix=".mkosi-", dir=os.path.dirname(config.output_signature)),
         )
 
         cmdline = ["gpg", "--detach-sign"]
@@ -4508,9 +4508,9 @@ def link_output_root_hash_p7s_file(config: MkosiConfig, state: MkosiState, root_
 
 def link_output_signature(config: MkosiConfig, state: MkosiState, signature: Optional[SomeIO]) -> None:
     if signature:
-        assert state.output_signature is not None
-        with complete_step("Linking SHA256SUMS.gpg file…", f"Linked {path_relative_to_cwd(state.output_signature)}"):
-            _link_output(config, state, signature.name, state.output_signature)
+        assert config.output_signature is not None
+        with complete_step("Linking SHA256SUMS.gpg file…", f"Linked {path_relative_to_cwd(config.output_signature)}"):
+            _link_output(config, state, signature.name, config.output_signature)
 
 
 def link_output_bmap(config: MkosiConfig, state: MkosiState, bmap: Optional[SomeIO]) -> None:
@@ -6040,7 +6040,7 @@ def unlink_output(config: MkosiConfig, state: MkosiState) -> None:
                 unlink_try_hard(config.output_root_hash_p7s_file)
 
             if config.sign:
-                unlink_try_hard(state.output_signature)
+                unlink_try_hard(config.output_signature)
 
             if config.bmap:
                 unlink_try_hard(config.output_bmap)
@@ -6729,7 +6729,7 @@ def check_output(config: MkosiConfig, state: MkosiState) -> None:
     for f in (
         config.output,
         config.output_checksum if config.checksum else None,
-        state.output_signature if config.sign else None,
+        config.output_signature if config.sign else None,
         config.output_bmap if config.bmap else None,
         config.output_nspawn_settings if config.nspawn_settings is not None else None,
         config.output_root_hash_file if config.verity else None,
@@ -6819,7 +6819,7 @@ def print_summary(config: MkosiConfig, state: MkosiState) -> None:
         MkosiPrinter.info(f"       Workspace Directory: {config.workspace_dir}")
     MkosiPrinter.info(f"                    Output: {config.output}")
     MkosiPrinter.info(f"           Output Checksum: {none_to_na(config.output_checksum if config.checksum else None)}")
-    MkosiPrinter.info(f"          Output Signature: {none_to_na(state.output_signature if config.sign else None)}")
+    MkosiPrinter.info(f"          Output Signature: {none_to_na(config.output_signature if config.sign else None)}")
     MkosiPrinter.info(f"               Output Bmap: {none_to_na(config.output_bmap if config.bmap else None)}")
     MkosiPrinter.info(f"  Generate split artifacts: {yes_no(config.split_artifacts)}")
     MkosiPrinter.info(

diff --git a/mkosi/backend.py b/mkosi/backend.py
index 7e92a55fab271b81238d65d884a880e45ed3d567..41d3cbb6bafda0d483bdf37034d95fabe64a72c3 100644 (file)
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -583,6 +583,7 @@ class MkosiConfig:
     output_split_verity: Optional[Path] = None
     output_split_verity_sig: Optional[Path] = None
     output_split_kernel: Optional[Path] = None
+    output_signature: Optional[Path] = None
 
     def architecture_is_native(self) -> bool:
         return self.architecture == platform.machine()
@@ -599,7 +600,6 @@ class MkosiState:
 
     cache_pre_inst: Optional[Path] = None
     cache_pre_dev: Optional[Path] = None
-    output_signature: Optional[Path] = None
 
     partition_table: Optional[PartitionTable] = None