yocto_recipe.py: fix path to cache.yaml in comment and overlay.get_fi…

…le_revision_logs() call Signed-off-by: Martin Jansa <martin.jansa@lge.com>
ros-infrastructure · Feb 5, 2020 · 92b7a1d · 92b7a1d
1 parent e050d9f
commit 92b7a1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/superflore/generators/bitbake/run.py b/superflore/generators/bitbake/run.py
@@ -178,7 +178,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)

diff --git a/superflore/generators/bitbake/yocto_recipe.py b/superflore/generators/bitbake/yocto_recipe.py
@@ -584,10 +584,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)