Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bitbake: Fix path to cache.yaml in various places #269

Merged
merged 1 commit into from
Mar 23, 2020
Merged

bitbake: Fix path to cache.yaml in various places #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions superflore/generators/bitbake/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ def main():
# Commit changes and file pull request
title =\
'{{{0}}} Selected recipes generated from '\
'{0}-cache.yaml as of {1}\n'.format(args.ros_distro, now)
'files/{0}/generated/cache.yaml '\
'as of {1}\n'.format(
args.ros_distro,
now)
regen_dict = dict()
regen_dict[args.ros_distro] = args.only
delta = "Regenerated: '%s'\n" % args.only
Expand Down Expand Up @@ -178,7 +181,8 @@ def main():
total_installers[adistro] = distro_installers
yoctoRecipe.generate_ros_distro_inc(
_repo, args.ros_distro, overlay.get_file_revision_logs(
'meta-ros{0}-{1}/files/cache.yaml'.format(
'meta-ros{0}-{1}/files/{1}/generated/cache.yaml'
.format(
yoctoRecipe._get_ros_version(args.ros_distro),
args.ros_distro)),
distro.release_platforms, skip_keys)
Expand Down Expand Up @@ -209,8 +213,10 @@ def main():
# remove duplicates
delta = gen_delta_msg(total_changes, markup='')
# Commit changes and file pull request
title = '{{{0}}} Sync to {0}-cache.yaml as of {1}\n'.format(
args.ros_distro, now)
title = '{{{0}}} Sync to files/{0}/generated/'\
'cache.yaml as of {1}\n'.format(
args.ros_distro,
now)
commit_msg = '\n'.join([get_pr_text(
title + '\n' + pr_comment.replace('**superflore**', 'superflore'),
markup=''), delta])
Expand Down
10 changes: 6 additions & 4 deletions superflore/generators/bitbake/yocto_recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,12 @@ def generate_ros_distro_inc(
'ROS_SUPERFLORE_GENERATION_NOT_POSSIBLE',
yoctoRecipe.not_generated_recipes) + '\n')
conf_file.write(
'# Number of commits that will be returned by'
+ ' "git log files/ROS_DISTRO-cache.yaml" when the '
+ 'generated files are committed. This is\n# used for the'
+ ' fourth version field of DISTRO_VERSION.\n')
'# Number of commits that will be returned by '
'"git log meta-ros{0}-{1}/files/{1}/generated/'
'cache.yaml" when the\n# generated files are committed. '
'This is used for the fourth version field of '
'DISTRO_VERSION.\n'
.format(yoctoRecipe._get_ros_version(distro), distro))
version = 1 if not version else len(version.splitlines()) + 1
conf_file.write(
'ROS_NUM_CACHE_YAML_COMMITS = "{}"'.format(version)
Expand Down