]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Add support for mkosi.clean.d and drop mkosi.configure.d
authorJörg Behrmann <behrmann@physik.fu-berlin.de>
Fri, 27 Sep 2024 09:52:04 +0000 (11:52 +0200)
committerJörg Behrmann <behrmann@physik.fu-berlin.de>
Fri, 27 Sep 2024 12:19:29 +0000 (14:19 +0200)
It makes sense to have multiple clean scripts, but with configuration we expect
a single output like with version and rootpw

mkosi/config.py

index 4ab7824a0fce78ca1ae534c798eba021173d3754..0720864528506bae799bafab4bd7b8b553880326 100644 (file)
@@ -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