]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Drop unnecessary make_executable() calls
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 9 Apr 2024 14:20:34 +0000 (16:20 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 9 Apr 2024 15:29:02 +0000 (17:29 +0200)
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.

mkosi/__init__.py

index 3228867019e8494413094388fc6d8528db4ce0bd..86b1494735c66ae25b75b665a6d79b276c1fa32c 100644 (file)
@@ -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