yocto_recipe.py: append to ROS_SUPERFLORE_GENERATED_BUILDTOOLS

* define ROS_SUPERFLORE_GENERATED_BUILDTOOLS_<DISTRO> and then append it to ROS_SUPERFLORE_GENERATED_BUILDTOOLS * that way when e.g. melodic and dashing are enabled at the same time and their generated ros-distro.inc parsed, ROS_SUPERFLORE_GENERATED_BUILDTOOLS will contain union of their ROS_SUPERFLORE_GENERATED_BUILDTOOLS_<DISTRO> while still keeping the separate list available if we need it for something else * fixes ros-infrastructure#255 Signed-off-by: Martin Jansa <[email protected]>
shr-project · Dec 3, 2019 · 31b491d · 31b491d
1 parent 2d7e1a2
commit 31b491d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/superflore/generators/bitbake/yocto_recipe.py b/superflore/generators/bitbake/yocto_recipe.py
@@ -612,8 +612,12 @@ def generate_ros_distro_inc(
                     + 'tools.\n')
                 conf_file.write(
                     yoctoRecipe.generate_multiline_variable(
-                        'ROS_SUPERFLORE_GENERATED_BUILDTOOLS',
+                        'ROS_SUPERFLORE_GENERATED_BUILDTOOLS_%s' %
+                        distro.upper(),
                         yoctoRecipe.generated_native_recipes) + '\n')
+                conf_file.write('ROS_SUPERFLORE_GENERATED_BUILDTOOLS_append ='
+                                '"${ROS_SUPERFLORE_GENERATED_BUILDTOOLS_%s}"'
+                                '\n\n' % distro.upper())
                 conf_file.write(yoctoRecipe.generate_multiline_variable(
                     'ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES',
                     yoctoRecipe.platform_deps))