From: Daan De Meyer Date: Tue, 10 Sep 2024 11:59:00 +0000 (+0200) Subject: Move Include= setting to [Include] section X-Git-Tag: v25~308^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f791c77e395021c98eba503ff3d4c1fab2b47b5;p=thirdparty%2Fmkosi.git Move Include= setting to [Include] section This allows us to treat includes distinctly from other [Config] settings in the next commit. --- diff --git a/mkosi/config.py b/mkosi/config.py index a1e8ac762..4d6e4a0c7 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -1878,7 +1878,7 @@ SETTINGS = ( ConfigSetting( dest="include", short="-I", - section="Config", + section="Include", parse=config_make_list_parser( delimiter=",", reset=False, diff --git a/mkosi/resources/man/mkosi.md b/mkosi/resources/man/mkosi.md index c4aa54db3..f0c7e7c28 100644 --- a/mkosi/resources/man/mkosi.md +++ b/mkosi/resources/man/mkosi.md @@ -1789,14 +1789,7 @@ config file is read: | `ToolsTreeDistribution=` | no | no | match default tools tree distribution | | `Environment=` | no | no | n/a | -### [Config] Section - -`Profile=`, `--profile=` -: Select the given profile. A profile is a configuration file or - directory in the `mkosi.profiles/` directory. When selected, this - configuration file or directory is included after parsing the - `mkosi.conf` file, but before any `mkosi.conf.d/*.conf` drop in - configuration. +### [Include] `Include=`, `--include=`, `-I` : Include extra configuration from the given file or directory. The @@ -1814,6 +1807,15 @@ config file is read: Note: Include names starting with either of the literals `mkosi-` or `contrib-` are reserved for use by mkosi itself. +### [Config] Section + +`Profile=`, `--profile=` +: Select the given profile. A profile is a configuration file or + directory in the `mkosi.profiles/` directory. When selected, this + configuration file or directory is included after parsing the + `mkosi.conf` file, but before any `mkosi.conf.d/*.conf` drop in + configuration. + `Dependencies=`, `--dependency=` : The images that this image depends on specified as a comma-separated list. All images configured in this option will be built before this