From: Luca Boccassi <bluca@debian.org>
Date: Sat, 30 Sep 2023 13:13:18 +0000 (+0100)
Subject: build/cache dir name: append architecture
X-Git-Tag: v18~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d8ef4fe3b3d7ee690e78cee1ff205e855d50781;p=thirdparty%2Fmkosi.git

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 0405d81ae..6bb14ddbd 100644
--- 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 9492fbc39..e46bd4c90 100644
--- 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: