From f756bcdf17915ffb3b8e3e21b4aa2b53ccaaac1a Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 28 Oct 2023 10:37:16 +0200
Subject: [PATCH] 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.
---
 mkosi.conf.d/10-systemd.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index 883ffc9cf2..02dfbedbe8 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_.