From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 12 Jul 2024 12:27:02 +0000 (+0200)
Subject: Mark various settings as universal
X-Git-Tag: v24~38^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f46429026edac9bddce6ec6e0bdb8ad09bf914c2;p=thirdparty%2Fmkosi.git

Mark various settings as universal

Let's make BuildSources=, BuildSourcesEphemeral=, WithTests= and
WithNetwork= universal so that packages can easily be built in a
subimage instead of in the main image build.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 76b4e7f72..fa23af146 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2357,6 +2357,7 @@ SETTINGS = (
         match=config_match_build_sources,
         default_factory=lambda ns: [ConfigTree(ns.directory, None)] if ns.directory else [],
         help="Path for sources to build",
+        universal=True,
     ),
     ConfigSetting(
         dest="build_sources_ephemeral",
@@ -2364,6 +2365,7 @@ SETTINGS = (
         section="Content",
         parse=config_parse_boolean,
         help="Make build sources ephemeral when running scripts",
+        universal=True,
     ),
     ConfigSetting(
         dest="environment",
@@ -2393,6 +2395,7 @@ SETTINGS = (
         parse=config_parse_boolean,
         default=True,
         help="Do not run tests as part of build scripts, if supported",
+        universal=True,
     ),
     ConfigSetting(
         dest="with_network",
@@ -2401,6 +2404,7 @@ SETTINGS = (
         section="Content",
         parse=config_parse_boolean,
         help="Run build and postinst scripts with network access (instead of private network)",
+        universal=True,
     ),
     ConfigSetting(
         dest="bootable",
diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index 6ba9e5a64..15f8d13ea 100644
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -2484,6 +2484,10 @@ overridden):
 - `PackageDirectories=`
 - `VolatilePackageDirectories=`
 - `SourceDateEpoch=`
+- `BuildSources=`
+- `BuildSourcesEphemeral=`
+- `WithTests`
+- `WithNetwork=`
 - `VerityKey=`
 - `VerityKeySource=`
 - `VerityCertificate=`