Drop ToolsTreeSyncScripts= and ToolsTreePrepareScripts=

These are not in an official release yet, and can be configured via
mkosi.tools.conf now with their regular setting alternatives, so let's
drop these.

diff --git a/mkosi/config.py b/mkosi/config.py
index 571d4044e8f17683fa2487923c5111874b8e54f2..9905f323f44dd753016d087b7480776583c69ec8 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -3587,28 +3587,6 @@ SETTINGS: list[ConfigSetting[Any]] = [
         help="Specify a directory containing extra tools tree packages",
         scope=SettingScope.tools,
     ),
-    ConfigSetting(
-        dest="tools_tree_sync_scripts",
-        long="--tools-tree-sync-script",
-        metavar="PATH",
-        section="Build",
-        parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
-        path_suffixes=("tools.sync",),
-        recursive_path_suffixes=("tools.sync.d/*",),
-        help="Sync script to run before building the tools tree",
-        scope=SettingScope.tools,
-    ),
-    ConfigSetting(
-        dest="tools_tree_prepare_scripts",
-        long="--tools-tree-prepare-script",
-        metavar="PATH",
-        section="Build",
-        parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
-        path_suffixes=("tools.prepare", "tools.prepare.chroot"),
-        recursive_path_suffixes=("tools.prepare.d/*",),
-        help="Prepare script to run inside the tools tree before it is cached",
-        scope=SettingScope.tools,
-    ),
     ConfigSetting(
         dest="tools_tree_certificates",
         metavar="BOOL",

diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index f352f79f61d9b0b32228b949aeaea6ff1842e1ed..ad6bfd78b9f7521630d81b9dd1cacfb34667e364 100644 (file)
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -1428,12 +1428,6 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
 `ToolsTreePackageDirectories=`, `--tools-tree-package-directory=`
 :   Same as `PackageDirectories=`, but for the default tools tree.
 
-`ToolsTreeSyncScripts=`, `--tools-tree-sync-script=`
-:   Same as `SyncScripts=`, but for the default tools tree.
-
-`ToolsTreePrepareScripts=`, `--tools-tree-prepare-script=`
-:   Same as `PrepareScripts=`, but for the default tools tree.
-
 `ToolsTreeCertificates=`, `--tools-tree-certificates=`
 :   Specify whether to use certificates and keys from the tools tree.
     Enabled by default. If enabled, `/etc/pki`, `/etc/ssl`,
@@ -2946,8 +2940,6 @@ the main image but which are not passed down to subimages:
 - `ToolsTreeSandboxTrees=`
 - `ToolsTreePackages=`
 - `ToolsTreePackageDirectories=`
-- `ToolsTreeSyncScripts=`
-- `ToolsTreePrepareScripts=`
 - `History=`
 - Every setting in the `[Runtime]` section