summaryrefslogtreecommitdiffstats
path: root/mkosi.conf.d
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-11-06 19:24:00 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-11-06 20:10:34 +0100
commite94f0af168206de9ebaa29461562caf1e1ff34df (patch)
tree0a14032c4884c7be46d5ce0f2fe815fa849275bf /mkosi.conf.d
parenttest: fix build without SBAT_DISTRO (diff)
downloadsystemd-e94f0af168206de9ebaa29461562caf1e1ff34df.tar.xz
systemd-e94f0af168206de9ebaa29461562caf1e1ff34df.zip
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.
Diffstat (limited to 'mkosi.conf.d')
-rw-r--r--mkosi.conf.d/10-systemd.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index 02dfbedbe8..883ffc9cf2 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_.