From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 6 Nov 2023 18:24:00 +0000 (+0100)
Subject: Revert "mkosi: Use cache and build subdirectories"
X-Git-Tag: v255-rc2~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e94f0af168206de9ebaa29461562caf1e1ff34df;p=thirdparty%2Fsystemd.git

Revert "mkosi: Use cache and build subdirectories"

We're not going ahead with the corresponding change in mkosi
after all so revert the preparatory change in systemd as well.

This reverts commit f756bcdf17915ffb3b8e3e21b4aa2b53ccaaac1a.
---

diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index 02dfbedbe85..883ffc9cf26 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
-CacheDirectory=mkosi.cache/%d~%r~%a
-BuildDirectory=mkosi.builddir/%d~%r~%a
+BuildDirectory=mkosi.builddir
+CacheDirectory=mkosi.cache
 
 [Content]
 # Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_.