From 670dfcb6ecdf72fc26a362086fe31560d2a5f789 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 9 Aug 2022 20:30:45 +0200 Subject: [PATCH 1/2] mkosi: Use mkosi.output/ as output directory by default Better than creating a mess of output files in the root directory. --- mkosi.default.d/10-systemd.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.default.d/10-systemd.conf b/mkosi.default.d/10-systemd.conf index 58b84cae98..00363e2a9f 100644 --- a/mkosi.default.d/10-systemd.conf +++ b/mkosi.default.d/10-systemd.conf @@ -8,6 +8,7 @@ Bootable=yes HostonlyInitrd=yes # Prevent ASAN warnings when building the image Environment=ASAN_OPTIONS=verify_asan_link_order=false +OutputDirectory=mkosi.output [Content] BuildDirectory=mkosi.builddir From d808662ec0dd4856818858595e3c523528dc1bfe Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 9 Aug 2022 20:31:29 +0200 Subject: [PATCH 2/2] mkosi: Don't use InstallDirectory by default While this provides some marginal speedup, the disadvantage is that files are never removed when doing cached builds, which can sometimes lead to hard to debug issues. So let's not do this by default. --- mkosi.default.d/10-systemd.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/mkosi.default.d/10-systemd.conf b/mkosi.default.d/10-systemd.conf index 00363e2a9f..8efd1e97fa 100644 --- a/mkosi.default.d/10-systemd.conf +++ b/mkosi.default.d/10-systemd.conf @@ -13,7 +13,6 @@ OutputDirectory=mkosi.output [Content] BuildDirectory=mkosi.builddir Cache=mkosi.cache -InstallDirectory=mkosi.installdir SourceFileTransferFinal=copy-git-others [Host]