diff mbox series

[3/6] bitbake-setup: rename 'write_config' into 'write_upstream_config'

Message ID 20251105190636.679388-3-alex.kanavin@gmail.com
State Accepted, archived
Commit 7f9cd4c1e91d110085d74f9b9f12884f97f4e8dd
Headers show
Series [1/6] bitbake-setup: rename function 'default_settings_path' to 'topdir_settings_path' | expand

Commit Message

Alexander Kanavin Nov. 5, 2025, 7:06 p.m. UTC 
From: Johannes Schneider <johannes.schneider@leica-geosystems.com>

Rename the function to reflect which (of the possibly many) files in
the build/config directory it writes to.

Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com>
---
 bin/bitbake-setup | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/bin/bitbake-setup b/bin/bitbake-setup
index 3f56f8378..59b4dfdb8 100755
--- a/bin/bitbake-setup
+++ b/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: