From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 9 Apr 2024 14:20:34 +0000 (+0200)
Subject: Drop unnecessary make_executable() calls
X-Git-Tag: v23~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65efc90cac76a96a3512d7887ac47e8d53f04a55;p=thirdparty%2Fmkosi.git

Drop unnecessary make_executable() calls

Use the builtin constants for --include= to include the default initrd
and tools tree so that parse_config() makes the scripts executable for
us instead of having to do it ourselves.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 322886701..86b149473 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1707,24 +1707,15 @@ def finalize_default_initrd(
         *(["-f"] * args.force),
     ]
 
-    cmdline += ["--include", os.fspath(resources / "mkosi-initrd")]
+    cmdline += ["--include=mkosi-initrd"]
 
     for include in config.initrd_include:
         cmdline += ["--include", os.fspath(include)]
 
     _, [config] = parse_config(cmdline + ["build"], resources=resources)
 
-    make_executable(*config.configure_scripts)
-
     run_configure_scripts(config)
 
-    make_executable(
-        *config.prepare_scripts,
-        *config.postinst_scripts,
-        *config.finalize_scripts,
-        *config.build_scripts,
-    )
-
     return dataclasses.replace(config, image="default-initrd")
 
 
@@ -4106,17 +4097,10 @@ def finalize_default_tools(args: Args, config: Config, *, resources: Path) -> Co
     ]
 
     _, [tools] = parse_config(
-        cmdline + ["--include", os.fspath(resources / "mkosi-tools"), "build"],
+        cmdline + ["--include=mkosi-tools", "build"],
         resources=resources,
     )
 
-    make_executable(
-        *tools.prepare_scripts,
-        *tools.postinst_scripts,
-        *tools.finalize_scripts,
-        *tools.build_scripts,
-    )
-
     tools = dataclasses.replace(tools, image=f"{config.tools_tree_distribution}-tools")
 
     return tools