From 30ddbac63af9d01eb37d1e6708ff7c27744878ac Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Wed, 22 May 2019 12:22:48 -0700 Subject: [PATCH] DRAFT {crystal} Blacklist and remove dependencies on Connext packages --- .../crystal/ros-distro-recipe-blacklist.inc | 18 ++++++++++++++++++ .../rmw-implementation/rmw-implementation.inc | 3 +++ .../rosidl-typesupport-c.inc | 3 +++ .../rosidl-typesupport-cpp.inc | 3 +++ 4 files changed, 27 insertions(+) create mode 100644 includes-ros2/rmw-implementation/rmw-implementation.inc create mode 100644 includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc create mode 100644 includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc diff --git a/conf/ros-distro/include/crystal/ros-distro-recipe-blacklist.inc b/conf/ros-distro/include/crystal/ros-distro-recipe-blacklist.inc index 77369c6..b89a7ad 100644 --- a/conf/ros-distro/include/crystal/ros-distro-recipe-blacklist.inc +++ b/conf/ros-distro/include/crystal/ros-distro-recipe-blacklist.inc @@ -14,3 +14,21 @@ PNBLACKLIST[packagegroup-ros1-kobuki] ?= "Not a ROS 2 package" # Initially, blacklist any non-platform recipes with multiple versions found by "bitbake-layers show-recipes --multiple". Remove # from the blacklist once a PREFERRED_VERSION_ setting is made in ros-distro-preferred-versions.inc . # (none) + +# +# Alternative implementations not yet supported. +# +PNBLACKLIST[connext-cmake-module] ?= "Not yet supporting use of Connext" +PNBLACKLIST[rmw-connext-cpp] ?= "Not yet supporting use of Connext" +PNBLACKLIST[rmw-connext-shared-cpp] ?= "Not yet supporting use of Connext" +PNBLACKLIST[rosidl-typesupport-connext-c] ?= "Not yet supporting use of Connext" +PNBLACKLIST[rosidl-typesupport-connext-cpp] ?= "Not yet supporting use of Connext" + +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "connext-cmake-module" +# rmw-implementation.inc removes "rmw-connext-cpp" from ROS_BUILD_DEPENDS. +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rmw-connext-cpp" +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rmw-connext-shared-cpp" +# rosidl-typesupport-c.inc removes "rosidl-typesupport-connext-c" from ROS_BUILD_DEPENDS. +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rosidl-typesupport-connext-c" +# rosidl-typesupport-cpp.inc removes "rosidl-typesupport-connext-cpp" from ROS_BUILD_DEPENDS. +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rosidl-typesupport-connext-cpp" diff --git a/includes-ros2/rmw-implementation/rmw-implementation.inc b/includes-ros2/rmw-implementation/rmw-implementation.inc new file mode 100644 index 0000000..58b31b7 --- /dev/null +++ b/includes-ros2/rmw-implementation/rmw-implementation.inc @@ -0,0 +1,3 @@ +# Copyright (c) 2019 LG Electronics, Inc. + +ROS_BUILD_DEPENDS_remove = "rmw-connext-cpp" diff --git a/includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc b/includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc new file mode 100644 index 0000000..b3fb66a --- /dev/null +++ b/includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc @@ -0,0 +1,3 @@ +# Copyright (c) YEAR LG Electronics, Inc. + +ROS_BUILD_DEPENDS_remove = "rosidl-typesupport-connext-c" diff --git a/includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc b/includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc new file mode 100644 index 0000000..0d68bb0 --- /dev/null +++ b/includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc @@ -0,0 +1,3 @@ +# Copyright (c) YEAR LG Electronics, Inc. + +ROS_BUILD_DEPENDS_remove = "rosidl-typesupport-connext-cpp"