build/cache dir name: append architecture

The builds and caches are architecture specific, so name them accordingly

diff --git a/mkosi/config.py b/mkosi/config.py
index 0405d81aeaf0e9e2c4c4b663d16324ee03a864a8..6bb14ddbdc9f3ae7dcf336309519b5903bb540d5 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2274,9 +2274,9 @@ def load_config(args: argparse.Namespace) -> MkosiConfig:
         die(f"Arguments after verb are not supported for {args.verb}.")
 
     if args.cache_dir:
-        args.cache_dir = args.cache_dir / f"{args.distribution}~{args.release}"
+        args.cache_dir = args.cache_dir / f"{args.distribution}~{args.release}~{args.architecture}"
     if args.build_dir:
-        args.build_dir = args.build_dir / f"{args.distribution}~{args.release}"
+        args.build_dir = args.build_dir / f"{args.distribution}~{args.release}~{args.architecture}"
 
     if args.sign:
         args.checksum = True

diff --git a/mkosi/state.py b/mkosi/state.py
index 9492fbc3941a83cc19656b16e4daa66f9eb227e7..e46bd4c9081d1246f87fd626b6bd3d92163adcfc 100644 (file)
--- a/mkosi/state.py
+++ b/mkosi/state.py
@@ -45,7 +45,7 @@ class MkosiState:
 
     @property
     def cache_dir(self) -> Path:
-        return self.config.cache_dir or self.workspace / f"cache/{self.config.distribution}~{self.config.release}"
+        return self.config.cache_dir or self.workspace / f"cache/{self.config.distribution}~{self.config.release}~{self.config.architecture}"
 
     @property
     def install_dir(self) -> Path: