mirror of
git://git.yoctoproject.org/poky
synced 2025-12-31 13:38:04 +00:00
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>
This commit is contained in:
parent
f339e5f07f
commit
729e6f2cfd
@ -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:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user