diff options
| author | Johannes Schneider <johannes.schneider@leica-geosystems.com> | 2025-11-05 20:06:33 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-06 18:03:46 +0000 |
| commit | 729e6f2cfda4cb1aefc7c6d03b6f834138fb1ed8 (patch) | |
| tree | 17d5e9013e084c8da5f19c5638fa74ef4edb8cf6 | |
| parent | f339e5f07f84862e02d0df74d49705cececb30f0 (diff) | |
| download | poky-729e6f2cfda4cb1aefc7c6d03b6f834138fb1ed8.tar.gz | |
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 <johannes.schneider@leica-geosystems.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bitbake/bin/bitbake-setup | 8 |
1 files 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): | |||
| 57 | else: | 57 | else: |
| 58 | raise Exception("Config file {} does not end with {}, please rename the file.".format(config, suffix)) | 58 | raise Exception("Config file {} does not end with {}, please rename the file.".format(config, suffix)) |
| 59 | 59 | ||
| 60 | def write_config(config, config_dir): | 60 | def write_upstream_config(config_dir, config_data): |
| 61 | with open(os.path.join(config_dir, "config-upstream.json"),'w') as s: | 61 | with open(os.path.join(config_dir, "config-upstream.json"),'w') as s: |
| 62 | json.dump(config, s, sort_keys=True, indent=4) | 62 | json.dump(config_data, s, sort_keys=True, indent=4) |
| 63 | 63 | ||
| 64 | def commit_config(config_dir): | 64 | def commit_config(config_dir): |
| 65 | bb.process.run("git -C {} add .".format(config_dir)) | 65 | bb.process.run("git -C {} add .".format(config_dir)) |
| @@ -469,7 +469,7 @@ def init_config(top_dir, settings, args, d): | |||
| 469 | 469 | ||
| 470 | bb.event.register("bb.build.TaskProgress", handle_task_progress, data=d) | 470 | bb.event.register("bb.build.TaskProgress", handle_task_progress, data=d) |
| 471 | 471 | ||
| 472 | write_config(upstream_config, confdir) | 472 | write_upstream_config(confdir, upstream_config) |
| 473 | commit_config(confdir) | 473 | commit_config(confdir) |
| 474 | update_build(upstream_config, confdir, setupdir, layerdir, d) | 474 | update_build(upstream_config, confdir, setupdir, layerdir, d) |
| 475 | 475 | ||
| @@ -526,7 +526,7 @@ def build_status(top_dir, settings, args, d, update=False): | |||
| 526 | source_overrides = current_upstream_config["source-overrides"] | 526 | source_overrides = current_upstream_config["source-overrides"] |
| 527 | new_upstream_config = obtain_config(top_dir, settings, args, source_overrides, d) | 527 | new_upstream_config = obtain_config(top_dir, settings, args, source_overrides, d) |
| 528 | 528 | ||
| 529 | write_config(new_upstream_config, confdir) | 529 | write_upstream_config(confdir, new_upstream_config) |
| 530 | config_diff = bb.process.run('git -C {} diff'.format(confdir))[0] | 530 | config_diff = bb.process.run('git -C {} diff'.format(confdir))[0] |
| 531 | 531 | ||
| 532 | if config_diff: | 532 | if config_diff: |
