| Message ID | 20260210174434.4992-1-logan.gallois@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Yoann Congal |
| Headers | show |
| Series | [whinlatter,v5] oe-setup-build: TEMPLATECONF were not applied correctly | expand |
diff --git a/scripts/oe-setup-build b/scripts/oe-setup-build index edbcd48355a..7bcdeee4c32 100755 --- a/scripts/oe-setup-build +++ b/scripts/oe-setup-build @@ -98,7 +98,7 @@ def setup_build_env(args): f.write(cmd_base) print("\nRun '. {}' to initialize the build in a current shell session.\n".format(initbuild)) - cmd = "TEMPLATECONF={} {}".format(template["templatepath"], cmd_base) + cmd = "TEMPLATECONF={}\n{}".format(template["templatepath"], cmd_base) if not no_shell: cmd = cmd + " && {}".format(os.environ.get('SHELL','bash')) print("Running:", cmd)
Since a recent change to support dash, cmd_base is a set of several commands, separated by newlines. TEMPLATECONF was only effective for the first command in that set, which is not where it's needed. Putting it on its own line will ensure that it's present for everything in cmd_base. Signed-off-by: Logan Gallois <logan.gallois@hexagon.com> --- scripts/oe-setup-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)