diff --git a/conf/ros-distro/ros-distro.conf b/conf/ros-distro/ros-distro.conf index 6598d210366..97b6758ab3f 100644 --- a/conf/ros-distro/ros-distro.conf +++ b/conf/ros-distro/ros-distro.conf @@ -77,20 +77,6 @@ require conf/ros-distro/include/${ROS_DISTRO}/ros-distro-recipe-blacklist.inc require conf/ros-distro/include/${ROS_DISTRO}/ros-distro-preferred-versions.inc -# Give ROS billing in DISTRO_NAME if being used in a foreign DISTRO. -ROS_DISTRO_NAME_PREPEND ?= "${@'' \ - if d.getVar('DISTRO', True) == d.getVar('ROS_DISTRO_TYPE', True) else \ - 'ROS ' + d.getVar('ROS_VERSION', True) + ' with ' \ - }" -DISTRO_NAME_prepend = "${ROS_DISTRO_NAME_PREPEND}" - -# Append the ROS metadata version to DISTRO_VERSION if being used in a foreign DISTRO. -ROS_OE_DISTRO_VERSION_APPEND ?= "${@'' \ - if d.getVar('DISTRO', True) == d.getVar('ROS_DISTRO_TYPE', True) else \ - '+' + d.getVar('ROS_DISTRO_METADATA_VERSION', True) \ - }" -DISTRO_VERSION_append = "${ROS_OE_DISTRO_VERSION_APPEND}" - # Default to showing DISTRO_NAME and the ROS build environment variable settings in the build configuration. ROS_EXTRA_BUILDCFG_VARS ?= "DISTRO_NAME ROS_DISTRO ROS_VERSION ROS_PYTHON_VERSION" BUILDCFG_VARS_append = " ${ROS_EXTRA_BUILDCFG_VARS}"