From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 5 Sep 2022 09:07:05 +0000 (+0200)
Subject: Normalize environment for all scripts
X-Git-Tag: v14~44^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1170%2Fhead;p=thirdparty%2Fmkosi.git

Normalize environment for all scripts

Let's make sure we run all scripts with the environment from the
config.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 68b617261..03be33228 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3159,8 +3159,6 @@ def nspawn_params_for_build_sources(config: MkosiConfig, sft: SourceFileTransfer
     else:
         params += ["--chdir=/root"]
 
-    params += [f"--setenv={env}={value}" for env, value in config.environment.items()]
-
     return params
 
 
@@ -3182,7 +3180,8 @@ def run_prepare_script(config: MkosiConfig, state: MkosiState, cached: bool) ->
         shutil.copy2(config.prepare_script, root_home(config, state.root) / "prepare")
 
         nspawn_params = nspawn_params_for_build_sources(config, SourceFileTransfer.mount)
-        run_workspace_command(config, state.root, ["/root/prepare", verb], network=True, nspawn_params=nspawn_params)
+        run_workspace_command(config, state.root, ["/root/prepare", verb],
+                              network=True, nspawn_params=nspawn_params, env=config.environment)
 
         srcdir = root_home(config, state.root) / "src"
         if srcdir.exists():
@@ -3211,8 +3210,7 @@ def run_postinst_script(
         shutil.copy2(config.postinst_script, root_home(config, state.root) / "postinst")
 
         run_workspace_command(config, state.root, ["/root/postinst", verb],
-                              network=(config.with_network is True),
-                              env=config.environment)
+                              network=(config.with_network is True), env=config.environment)
         root_home(config, state.root).joinpath("postinst").unlink()
 
 
@@ -3229,10 +3227,8 @@ def run_finalize_script(config: MkosiConfig, state: MkosiState, for_cache: bool)
     verb = "build" if state.do_run_build_script else "final"
 
     with complete_step("Running finalize script…"):
-        env = collections.ChainMap(dict(BUILDROOT=str(state.root), OUTPUTDIR=str(output_dir(config))),
-                                   config.environment,
-                                   os.environ)
-        run([config.finalize_script, verb], env=env)
+        run([config.finalize_script, verb],
+            env={**config.environment, "BUILDROOT": str(state.root), "OUTPUTDIR": str(output_dir(config))})
 
 
 
@@ -7331,8 +7327,6 @@ def run_build_script(config: MkosiConfig, root: Path, raw: Optional[BinaryIO]) -
             *nspawn_rlimit_params(),
         ]
 
-        cmdline.extend(f"--setenv={env}={value}" for env, value in config.environment.items())
-
         # TODO: Use --autopipe once systemd v247 is widely available.
         console_arg = f"--console={'interactive' if sys.stdout.isatty() else 'pipe'}"
         if nspawn_knows_arg(console_arg):
@@ -7371,6 +7365,8 @@ def run_build_script(config: MkosiConfig, root: Path, raw: Optional[BinaryIO]) -
         if config.nspawn_keep_unit:
             cmdline += ["--keep-unit"]
 
+        cmdline += [f"--setenv={env}={value}" for env, value in config.environment.items()]
+
         cmdline += [f"/root/{config.build_script.name}"]
 
         # When we're building the image because it's required for another verb, any passed arguments are most