{eloquent} Sync to files/eloquent/generated/cache.yaml as of 20200811…

…171906 Regenerate with superflore from: ros-infrastructure/superflore#280 and more rosdistro/rosdep changes from: ros/rosdistro#27623 Recipes generated by superflore for all packages in ROS distribution eloquent. This pull request was generated by running the following command: superflore-gen-oe-recipes --dry-run --no-branch --ros-distro eloquent --output-repository-path . --upstream-branch HEAD
ros · Dec 10, 2020 · 6d4337b · 6d4337b
1 parent b925651
commit 6d4337b
Show file tree

Hide file tree

Showing 23 changed files with 131 additions and 132 deletions.
diff --git a/meta-ros2-eloquent/conf/ros-distro/include/eloquent/generated/superflore-ros-distro.inc b/meta-ros2-eloquent/conf/ros-distro/include/eloquent/generated/superflore-ros-distro.inc
@@ -7,7 +7,7 @@
 # resets it to "0").
 ROS_DISTRO_METADATA_VERSION_REVISION = "0"
 
-ROS_SUPERFLORE_PROGRAM_VERSION = "0.3.2+14.g1995657"
+ROS_SUPERFLORE_PROGRAM_VERSION = "0.3.2+15.g905b03f"
 ROS_SUPERFLORE_GENERATION_SCHEME = "2"
 
 ROS_DISTRO_TYPE = "ros2"
@@ -1651,8 +1651,8 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES = " \
 # include those found in the ROS_EXEC_DEPENDS values in the recipes of build tools.
 ROS_SUPERFLORE_GENERATED_BUILDTOOLS_ELOQUENT = " \
     ${PYTHON_PN}-virtualenv-native \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libopensplice69-native} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1-native} \
+    ${ROS_UNRESOLVED_DEP-libopensplice69-native} \
+    ${ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1-native} \
     ament-clang-format-native \
     ament-clang-tidy-native \
     ament-cmake-auto-native \
@@ -1744,31 +1744,31 @@ ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES = " \
     ${PYTHON_PN}-tkinter \
     ${PYTHON_PN}-virtualenv \
     ${PYTHON_PN}-virtualenv-native \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_clang-format} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_clang-tidy} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcbc-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcgl-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libclp-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcoinutils-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libgazebo9-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libopenexr-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libopensplice69-native} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libopensplice69} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libopenvdb-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libopenvdb} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqtgui4} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_qttools5-dev-tools} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1-native} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_tango-icon-theme} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_uncrustify} \
+    ${ROS_UNRESOLVED_DEP-clang-format} \
+    ${ROS_UNRESOLVED_DEP-clang-tidy} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcbc-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcgl-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libclp-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcoinutils-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libipopt-dev} \
+    ${ROS_UNRESOLVED_DEP-libcunit-dev} \
+    ${ROS_UNRESOLVED_DEP-libgazebo9-dev} \
+    ${ROS_UNRESOLVED_DEP-libopenexr-dev} \
+    ${ROS_UNRESOLVED_DEP-libopensplice69-native} \
+    ${ROS_UNRESOLVED_DEP-libopensplice69} \
+    ${ROS_UNRESOLVED_DEP-libopenvdb-dev} \
+    ${ROS_UNRESOLVED_DEP-libopenvdb} \
+    ${ROS_UNRESOLVED_DEP-libqglviewer-qt4-dev} \
+    ${ROS_UNRESOLVED_DEP-libqglviewer-qt4} \
+    ${ROS_UNRESOLVED_DEP-libqt4-dev} \
+    ${ROS_UNRESOLVED_DEP-libqt4-opengl-dev} \
+    ${ROS_UNRESOLVED_DEP-libqt4-opengl} \
+    ${ROS_UNRESOLVED_DEP-libqtgui4} \
+    ${ROS_UNRESOLVED_DEP-qttools5-dev-tools} \
+    ${ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1-native} \
+    ${ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1} \
+    ${ROS_UNRESOLVED_DEP-uncrustify} \
+    adwaita-icon-theme \
     asio \
     assimp \
     bison \
@@ -1884,7 +1884,7 @@ ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES = " \
 
 # Packages found only in <test_depend> items. Does not include those found only in the ROS_*_DEPENDS of recipes of tests.
 ROS_SUPERFLORE_GENERATED_TESTS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev} \
+    ${ROS_UNRESOLVED_DEP-libcunit-dev} \
     ament-copyright \
     ament-flake8 \
     ament-mypy \
@@ -2106,31 +2106,30 @@ ROS_SUPERFLORE_GENERATED_RECIPES_FOR_COMPONENTS = " \
 
 # Platform packages without a OE-RECIPE@OE-LAYER mapping in base.yaml, python.yaml, or ruby.yaml. Until they are added, override
 # the settings in ros-distro.inc .
-ROS_UNRESOLVED_PLATFORM_PKG_clang-format = "UNRESOLVED-clang-format"
-ROS_UNRESOLVED_PLATFORM_PKG_clang-tidy = "UNRESOLVED-clang-tidy"
-ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcbc-dev = "UNRESOLVED-coinor-libcbc-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcgl-dev = "UNRESOLVED-coinor-libcgl-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_coinor-libclp-dev = "UNRESOLVED-coinor-libclp-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcoinutils-dev = "UNRESOLVED-coinor-libcoinutils-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev = "UNRESOLVED-coinor-libipopt-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev = "UNRESOLVED-libcunit-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libgazebo9-dev = "UNRESOLVED-libgazebo9-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libopenexr-dev = "UNRESOLVED-libopenexr-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libopensplice69 = "UNRESOLVED-libopensplice69"
-ROS_UNRESOLVED_PLATFORM_PKG_libopensplice69-native = "UNRESOLVED-libopensplice69-native"
-ROS_UNRESOLVED_PLATFORM_PKG_libopenvdb = "UNRESOLVED-libopenvdb"
-ROS_UNRESOLVED_PLATFORM_PKG_libopenvdb-dev = "UNRESOLVED-libopenvdb-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4 = "UNRESOLVED-libqglviewer-qt4"
-ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4-dev = "UNRESOLVED-libqglviewer-qt4-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libqt4-dev = "UNRESOLVED-libqt4-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl = "UNRESOLVED-libqt4-opengl"
-ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl-dev = "UNRESOLVED-libqt4-opengl-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libqtgui4 = "UNRESOLVED-libqtgui4"
-ROS_UNRESOLVED_PLATFORM_PKG_qttools5-dev-tools = "UNRESOLVED-qttools5-dev-tools"
-ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1 = "UNRESOLVED-rti-connext-dds-5.3.1"
-ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1-native = "UNRESOLVED-rti-connext-dds-5.3.1-native"
-ROS_UNRESOLVED_PLATFORM_PKG_tango-icon-theme = "UNRESOLVED-tango-icon-theme"
-ROS_UNRESOLVED_PLATFORM_PKG_uncrustify = "UNRESOLVED-uncrustify"
+ROS_UNRESOLVED_DEP-clang-format = "ROS_UNRESOLVED_DEP-clang-format"
+ROS_UNRESOLVED_DEP-clang-tidy = "ROS_UNRESOLVED_DEP-clang-tidy"
+ROS_UNRESOLVED_DEP-coinor-libcbc-dev = "ROS_UNRESOLVED_DEP-coinor-libcbc-dev"
+ROS_UNRESOLVED_DEP-coinor-libcgl-dev = "ROS_UNRESOLVED_DEP-coinor-libcgl-dev"
+ROS_UNRESOLVED_DEP-coinor-libclp-dev = "ROS_UNRESOLVED_DEP-coinor-libclp-dev"
+ROS_UNRESOLVED_DEP-coinor-libcoinutils-dev = "ROS_UNRESOLVED_DEP-coinor-libcoinutils-dev"
+ROS_UNRESOLVED_DEP-coinor-libipopt-dev = "ROS_UNRESOLVED_DEP-coinor-libipopt-dev"
+ROS_UNRESOLVED_DEP-libcunit-dev = "ROS_UNRESOLVED_DEP-libcunit-dev"
+ROS_UNRESOLVED_DEP-libgazebo9-dev = "ROS_UNRESOLVED_DEP-libgazebo9-dev"
+ROS_UNRESOLVED_DEP-libopenexr-dev = "ROS_UNRESOLVED_DEP-libopenexr-dev"
+ROS_UNRESOLVED_DEP-libopensplice69 = "ROS_UNRESOLVED_DEP-libopensplice69"
+ROS_UNRESOLVED_DEP-libopensplice69-native = "ROS_UNRESOLVED_DEP-libopensplice69-native"
+ROS_UNRESOLVED_DEP-libopenvdb = "ROS_UNRESOLVED_DEP-libopenvdb"
+ROS_UNRESOLVED_DEP-libopenvdb-dev = "ROS_UNRESOLVED_DEP-libopenvdb-dev"
+ROS_UNRESOLVED_DEP-libqglviewer-qt4 = "ROS_UNRESOLVED_DEP-libqglviewer-qt4"
+ROS_UNRESOLVED_DEP-libqglviewer-qt4-dev = "ROS_UNRESOLVED_DEP-libqglviewer-qt4-dev"
+ROS_UNRESOLVED_DEP-libqt4-dev = "ROS_UNRESOLVED_DEP-libqt4-dev"
+ROS_UNRESOLVED_DEP-libqt4-opengl = "ROS_UNRESOLVED_DEP-libqt4-opengl"
+ROS_UNRESOLVED_DEP-libqt4-opengl-dev = "ROS_UNRESOLVED_DEP-libqt4-opengl-dev"
+ROS_UNRESOLVED_DEP-libqtgui4 = "ROS_UNRESOLVED_DEP-libqtgui4"
+ROS_UNRESOLVED_DEP-qttools5-dev-tools = "ROS_UNRESOLVED_DEP-qttools5-dev-tools"
+ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1 = "ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1"
+ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1-native = "ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1-native"
+ROS_UNRESOLVED_DEP-uncrustify = "ROS_UNRESOLVED_DEP-uncrustify"
 
 # From the release announcement or the last field of the "<ROS_DISTRO>/YYYY-MM-DD" tag for the release in
 # https://github.com/ros/rosdistro/tags. Prior to the first release of a ROS_DISTRO, it is set to "".

diff --git a/meta-ros2-eloquent/files/eloquent/generated/rosdep-resolve.yaml b/meta-ros2-eloquent/files/eloquent/generated/rosdep-resolve.yaml
@@ -10,21 +10,21 @@ boost:
 bzip2:
 - bzip2@openembedded-core
 clang-format:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_clang-format}
+- ${ROS_UNRESOLVED_DEP-clang-format}
 clang-tidy:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_clang-tidy}
+- ${ROS_UNRESOLVED_DEP-clang-tidy}
 cmake:
 - cmake@openembedded-core
 coinor-libcbc-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcbc-dev}
+- ${ROS_UNRESOLVED_DEP-coinor-libcbc-dev}
 coinor-libcgl-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcgl-dev}
+- ${ROS_UNRESOLVED_DEP-coinor-libcgl-dev}
 coinor-libclp-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libclp-dev}
+- ${ROS_UNRESOLVED_DEP-coinor-libclp-dev}
 coinor-libcoinutils-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcoinutils-dev}
+- ${ROS_UNRESOLVED_DEP-coinor-libcoinutils-dev}
 coinor-libipopt-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev}
+- ${ROS_UNRESOLVED_DEP-coinor-libipopt-dev}
 cppcheck:
 - cppcheck@meta-ros-common
 cppunit:
@@ -72,15 +72,15 @@ libceres-dev:
 libconsole-bridge-dev:
 - console-bridge@meta-ros-common
 libcunit-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev}
+- ${ROS_UNRESOLVED_DEP-libcunit-dev}
 libfreetype6:
 - freetype@openembedded-core
 libfreetype6-dev:
 - freetype@openembedded-core
 libftdi-dev:
 - libftdi@meta-oe
 libgazebo9-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libgazebo9-dev}
+- ${ROS_UNRESOLVED_DEP-libgazebo9-dev}
 libgeos++-dev:
 - geos@meta-oe
 libgflags-dev:
@@ -106,13 +106,13 @@ libogg:
 libopencv-dev:
 - opencv@meta-oe
 libopenexr-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libopenexr-dev}
+- ${ROS_UNRESOLVED_DEP-libopenexr-dev}
 libopensplice69:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libopensplice69}
+- ${ROS_UNRESOLVED_DEP-libopensplice69}
 libopenvdb:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libopenvdb}
+- ${ROS_UNRESOLVED_DEP-libopenvdb}
 libopenvdb-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libopenvdb-dev}
+- ${ROS_UNRESOLVED_DEP-libopenvdb-dev}
 libpcap:
 - libpcap@openembedded-core
 libpcl-all:
@@ -124,15 +124,15 @@ libpng-dev:
 libpoco-dev:
 - poco@meta-oe
 libqglviewer-qt4:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4}
+- ${ROS_UNRESOLVED_DEP-libqglviewer-qt4}
 libqglviewer-qt4-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4-dev}
+- ${ROS_UNRESOLVED_DEP-libqglviewer-qt4-dev}
 libqt4-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-dev}
+- ${ROS_UNRESOLVED_DEP-libqt4-dev}
 libqt4-opengl:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl}
+- ${ROS_UNRESOLVED_DEP-libqt4-opengl}
 libqt4-opengl-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl-dev}
+- ${ROS_UNRESOLVED_DEP-libqt4-opengl-dev}
 libqt5-core:
 - qtbase@meta-qt5
 libqt5-gui:
@@ -144,7 +144,7 @@ libqt5-opengl-dev:
 libqt5-widgets:
 - qtbase@meta-qt5
 libqtgui4:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libqtgui4}
+- ${ROS_UNRESOLVED_DEP-libqtgui4}
 libreadline:
 - readline@openembedded-core
 libsqlite3-dev:
@@ -278,9 +278,9 @@ qt5-qmake:
 qtbase5-dev:
 - qtbase@meta-qt5
 qttools5-dev-tools:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_qttools5-dev-tools}
+- ${ROS_UNRESOLVED_DEP-qttools5-dev-tools}
 rti-connext-dds-5.3.1:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1}
+- ${ROS_UNRESOLVED_DEP-rti-connext-dds-5.3.1}
 sdl:
 - libsdl@openembedded-core
 sdl-image:
@@ -291,15 +291,15 @@ suitesparse:
 - suitesparse-cholmod@meta-ros-common
 - suitesparse-cxsparse@meta-ros-common
 tango-icon-theme:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_tango-icon-theme}
+- adwaita-icon-theme@openembedded-core
 tbb:
 - tbb@meta-oe
 tinyxml:
 - libtinyxml@meta-oe
 tinyxml2:
 - libtinyxml2@meta-oe
 uncrustify:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_uncrustify}
+- ${ROS_UNRESOLVED_DEP-uncrustify}
 yaml:
 - libyaml@openembedded-core
 yaml-cpp:

diff --git a/meta-ros2-eloquent/generated-recipes/ament-lint/ament-clang-format_0.8.1-1.bb b/meta-ros2-eloquent/generated-recipes/ament-lint/ament-clang-format_0.8.1-1.bb
@@ -24,7 +24,7 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_clang-format} \
+    ${ROS_UNRESOLVED_DEP-clang-format} \
     python3-pyyaml \
 "
 

diff --git a/meta-ros2-eloquent/generated-recipes/ament-lint/ament-clang-tidy_0.8.1-1.bb b/meta-ros2-eloquent/generated-recipes/ament-lint/ament-clang-tidy_0.8.1-1.bb
@@ -24,7 +24,7 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_clang-tidy} \
+    ${ROS_UNRESOLVED_DEP-clang-tidy} \
     python3-pyyaml \
 "
 

diff --git a/meta-ros2-eloquent/generated-recipes/control-box-rst/control-box-rst_0.0.7-1.bb b/meta-ros2-eloquent/generated-recipes/control-box-rst/control-box-rst_0.0.7-1.bb
@@ -17,7 +17,7 @@ ROS_CN = "control_box_rst"
 ROS_BPN = "control_box_rst"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libipopt-dev} \
     libeigen \
 "
 
@@ -26,14 +26,14 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libipopt-dev} \
     libeigen \
 "
 
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libipopt-dev} \
     libeigen \
 "
 

diff --git a/meta-ros2-eloquent/generated-recipes/cyclonedds/cyclonedds_0.5.1-2.bb b/meta-ros2-eloquent/generated-recipes/cyclonedds/cyclonedds_0.5.1-2.bb
@@ -35,7 +35,7 @@ ROS_EXEC_DEPENDS = " \
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
 ROS_TEST_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev} \
+    ${ROS_UNRESOLVED_DEP-libcunit-dev} \
 "
 
 DEPENDS = "${ROS_BUILD_DEPENDS} ${ROS_BUILDTOOL_DEPENDS}"

diff --git a/meta-ros2-eloquent/generated-recipes/gazebo-ros-pkgs/gazebo-rosdev_3.4.4-1.bb b/meta-ros2-eloquent/generated-recipes/gazebo-ros-pkgs/gazebo-rosdev_3.4.4-1.bb
@@ -23,7 +23,7 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libgazebo9-dev} \
+    ${ROS_UNRESOLVED_DEP-libgazebo9-dev} \
 "
 
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""

diff --git a/meta-ros2-eloquent/generated-recipes/octomap/octovis_1.9.3-1.bb b/meta-ros2-eloquent/generated-recipes/octomap/octovis_1.9.3-1.bb
@@ -17,9 +17,9 @@ ROS_CN = "octomap"
 ROS_BPN = "octovis"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl-dev} \
+    ${ROS_UNRESOLVED_DEP-libqglviewer-qt4-dev} \
+    ${ROS_UNRESOLVED_DEP-libqt4-dev} \
+    ${ROS_UNRESOLVED_DEP-libqt4-opengl-dev} \
     octomap \
 "
 
@@ -32,9 +32,9 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqglviewer-qt4} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqt4-opengl} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libqtgui4} \
+    ${ROS_UNRESOLVED_DEP-libqglviewer-qt4} \
+    ${ROS_UNRESOLVED_DEP-libqt4-opengl} \
+    ${ROS_UNRESOLVED_DEP-libqtgui4} \
     octomap \
 "
 

diff --git a/meta-ros2-eloquent/generated-recipes/popf/popf_0.0.11-1.bb b/meta-ros2-eloquent/generated-recipes/popf/popf_0.0.11-1.bb
@@ -17,10 +17,10 @@ ROS_CN = "popf"
 ROS_BPN = "popf"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcbc-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcgl-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libclp-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcoinutils-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcbc-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcgl-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libclp-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcoinutils-dev} \
     bison \
     flex \
     rclcpp \
@@ -31,10 +31,10 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcbc-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcgl-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libclp-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcoinutils-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcbc-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcgl-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libclp-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcoinutils-dev} \
     bison \
     flex \
     rclcpp \
@@ -43,10 +43,10 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcbc-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcgl-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libclp-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libcoinutils-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcbc-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcgl-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libclp-dev} \
+    ${ROS_UNRESOLVED_DEP-coinor-libcoinutils-dev} \
     bison \
     flex \
     rclcpp \