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 02dfbedbe85d7a404b2a1969758406e5167a04d0..883ffc9cf261129483eda7fa04aaf2d44e43e182 100644 (file)
--- 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_.