mkosi: Only make build sources ephemeral if NO_BUILD is not enabled

If we're not building distribution packages from source, there's no
need to make the build sources ephemeral so don't enable the setting
if NO_BUILD is enabled.

diff --git a/mkosi.conf b/mkosi.conf
index e4c866c9ba100b8dd2c49e96f4806968811c1a75..954012ee0f050bb4d548cc75865a0fc6d490dc80 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -33,7 +33,6 @@ OutputDirectory=build/mkosi.output
 ToolsTree=default
 BuildDirectory=build/mkosi.builddir
 CacheDirectory=build/mkosi.cache
-BuildSourcesEphemeral=yes
 Incremental=yes
 
 [Validation]

diff --git a/mkosi.conf.d/20-build.conf b/mkosi.conf.d/20-build.conf
index 8c16d9b9f875d66dce526bdaa715398a4ce51489..f9b4a0aaf57fe124f20459e2d9a2a4e1a37f6188 100644 (file)
--- a/mkosi.conf.d/20-build.conf
+++ b/mkosi.conf.d/20-build.conf
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# Add a dependency on the build image unless NO_BUILD=1.
+# Add a dependency on the build image and make the build sources ephemeral unless NO_BUILD=1.
 
 [Match]
 Environment=!NO_BUILD=1
 
 [Config]
 Dependencies=build
+BuildSourcesEphemeral=yes