From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 28 Oct 2023 08:37:16 +0000 (+0200)
Subject: mkosi: Use cache and build subdirectories
X-Git-Tag: v255-rc1~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f756bcdf17915ffb3b8e3e21b4aa2b53ccaaac1a;p=thirdparty%2Fsystemd.git

mkosi: Use cache and build subdirectories

Next release of mkosi will not use subdirectories under the cache
and build directory by default anymore, so let's make sure we already
start creating those ourselves.
---

diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index 883ffc9cf26..02dfbedbe85 100644
--- a/mkosi.conf.d/10-systemd.conf
+++ b/mkosi.conf.d/10-systemd.conf
@@ -5,8 +5,8 @@ Presets=system
 
 [Output]
 OutputDirectory=mkosi.output
-BuildDirectory=mkosi.builddir
-CacheDirectory=mkosi.cache
+CacheDirectory=mkosi.cache/%d~%r~%a
+BuildDirectory=mkosi.builddir/%d~%r~%a
 
 [Content]
 # Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_.