From: Jörg Behrmann <behrmann@physik.fu-berlin.de>
Date: Fri, 27 Sep 2024 09:52:04 +0000 (+0200)
Subject: Add support for mkosi.clean.d and drop mkosi.configure.d
X-Git-Tag: v25~262^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81e48d2311f6b8945955145437d3b2cad362c461;p=thirdparty%2Fmkosi.git

Add support for mkosi.clean.d and drop mkosi.configure.d

It makes sense to have multiple clean scripts, but with configuration we expect
a single output like with version and rootpw
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 4ab7824a0..072086452 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2024,7 +2024,6 @@ SETTINGS = (
         section="Config",
         parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
         paths=("mkosi.configure",),
-        recursive_paths=("mkosi.configure.d/",),
         help="Configure script to run before doing anything",
     ),
     ConfigSetting(
@@ -2254,6 +2253,7 @@ SETTINGS = (
         section="Output",
         parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
         paths=("mkosi.clean",),
+        recursive_paths=("mkosi.clean.d",),
         help="Clean script to run after cleanup",
     ),
     # Content section