From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 27 Mar 2024 13:38:51 +0000 (+0100)
Subject: Move ConfigureScripts= to [Config] section
X-Git-Tag: v23~54^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b4c49c70d02ad1f27415fb33c15e90f5fcbd5d8;p=thirdparty%2Fmkosi.git

Move ConfigureScripts= to [Config] section
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 7b94d4f24..d1aea42f1 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1728,6 +1728,15 @@ SETTINGS = (
         parse=config_parse_minimum_version,
         help="Specify the minimum required mkosi version",
     ),
+    ConfigSetting(
+        dest="configure_scripts",
+        long="--configure-script",
+        metavar="PATH",
+        section="Config",
+        parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
+        paths=("mkosi.configure",),
+        help="Configure script to run before doing anything",
+    ),
     ConfigSetting(
         dest="distribution",
         short="-d",
@@ -2076,15 +2085,6 @@ SETTINGS = (
         default_factory_depends=("environment",),
         help="Set the $SOURCE_DATE_EPOCH timestamp",
     ),
-    ConfigSetting(
-        dest="configure_scripts",
-        long="--configure-script",
-        metavar="PATH",
-        section="Content",
-        parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
-        paths=("mkosi.configure",),
-        help="Configure script to run before doing anything",
-    ),
     ConfigSetting(
         dest="sync_scripts",
         long="--sync-script",
@@ -3697,6 +3697,7 @@ def summary(config: Config) -> str:
                              Images: {line_join_list(config.images)}
                        Dependencies: {line_join_list(config.dependencies)}
                     Minimum Version: {none_to_none(config.minimum_version)}
+                  Configure Scripts: {line_join_list(config.configure_scripts)}
 
     {bold("DISTRIBUTION")}:
                        Distribution: {bold(config.distribution)}
@@ -3744,7 +3745,6 @@ def summary(config: Config) -> str:
      Clean Package Manager Metadata: {config.clean_package_metadata}
                   Source Date Epoch: {none_to_none(config.source_date_epoch)}
 
-                  Configure Scripts: {line_join_list(config.configure_scripts)}
                        Sync Scripts: {line_join_list(config.sync_scripts)}
                     Prepare Scripts: {line_join_list(config.prepare_scripts)}
                       Build Scripts: {line_join_list(config.build_scripts)}
diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index 6dd64c369..b33914bd3 100644
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -543,6 +543,12 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
 : The minimum mkosi version required to build this configuration. If
   specified multiple times, the highest specified version is used.
 
+`ConfigureScripts=`, `--configure-script=`
+
+: Takes a comma-separated list of paths to executables that are used as
+  the configure scripts for this image. See the **Scripts** section for
+  more information.
+
 ### [Distribution] Section
 
 `Distribution=`, `--distribution=`, `-d`
@@ -1026,12 +1032,6 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
   package manager executable is *not* present at the end of the
   installation.
 
-`ConfigureScripts=`, `--configure-script=`
-
-: Takes a comma-separated list of paths to executables that are used as
-  the configure scripts for this image. See the **Scripts** section for
-  more information.
-
 `SyncScripts=`, `--sync-script=`
 
 : Takes a comma-separated list of paths to executables that are used as