From 729e6f2cfda4cb1aefc7c6d03b6f834138fb1ed8 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Wed, 5 Nov 2025 20:06:33 +0100 Subject: [PATCH] bitbake: bitbake-setup: rename 'write_config' into 'write_upstream_config' Rename the function to reflect which (of the possibly many) files in the build/config directory it writes to. (Bitbake rev: 7f9cd4c1e91d110085d74f9b9f12884f97f4e8dd) Signed-off-by: Johannes Schneider Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-setup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bitbake/bin/bitbake-setup b/bitbake/bin/bitbake-setup index 3f56f83784..59b4dfdb8e 100755 --- a/bitbake/bin/bitbake-setup +++ b/bitbake/bin/bitbake-setup @@ -57,9 +57,9 @@ def get_config_name(config): else: raise Exception("Config file {} does not end with {}, please rename the file.".format(config, suffix)) -def write_config(config, config_dir): +def write_upstream_config(config_dir, config_data): with open(os.path.join(config_dir, "config-upstream.json"),'w') as s: - json.dump(config, s, sort_keys=True, indent=4) + json.dump(config_data, s, sort_keys=True, indent=4) def commit_config(config_dir): bb.process.run("git -C {} add .".format(config_dir)) @@ -469,7 +469,7 @@ def init_config(top_dir, settings, args, d): bb.event.register("bb.build.TaskProgress", handle_task_progress, data=d) - write_config(upstream_config, confdir) + write_upstream_config(confdir, upstream_config) commit_config(confdir) update_build(upstream_config, confdir, setupdir, layerdir, d) @@ -526,7 +526,7 @@ def build_status(top_dir, settings, args, d, update=False): source_overrides = current_upstream_config["source-overrides"] new_upstream_config = obtain_config(top_dir, settings, args, source_overrides, d) - write_config(new_upstream_config, confdir) + write_upstream_config(confdir, new_upstream_config) config_diff = bb.process.run('git -C {} diff'.format(confdir))[0] if config_diff: