From c0a11874df22a0bd99a3041b27ceff4101a3c031 Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Wed, 22 May 2019 13:04:59 -0700 Subject: [PATCH] DRAFT {crystal} Blacklist and remove dependencies on OpenSplice packages --- .../include/crystal/ros-distro-recipe-blacklist.inc | 13 +++++++++++++ .../rmw-implementation/rmw-implementation.inc | 1 + .../rosidl-typesupport/rosidl-typesupport-c.inc | 1 + .../rosidl-typesupport/rosidl-typesupport-cpp.inc | 1 + 4 files changed, 16 insertions(+) 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 b89a7ad..3702874 100644 --- a/conf/ros-distro/include/crystal/ros-distro-recipe-blacklist.inc +++ b/conf/ros-distro/include/crystal/ros-distro-recipe-blacklist.inc @@ -32,3 +32,16 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rmw-connext-shared-cpp" 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" + +PNBLACKLIST[opensplice-cmake-module] ?= "Not yet supporting use of OpenSplice" +PNBLACKLIST[rmw-opensplice-cpp] ?= "Not yet supporting use of OpenSplice" +PNBLACKLIST[rosidl-typesupport-opensplice-c] ?= "Not yet supporting use of OpenSplice" +PNBLACKLIST[rosidl-typesupport-opensplice-cpp] ?= "Not yet supporting use of OpenSplice" + +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "opensplice-cmake-module" +# rmw-implementation.inc removes "rmw-opensplice-cpp" from ROS_BUILD_DEPENDS. +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rmw-opensplice-cpp" +# rosidl-typesupport-c.inc removes "rosidl-typesupport-opensplice-c" from ROS_BUILD_DEPENDS. +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rosidl-typesupport-opensplice-c" +# rosidl-typesupport-cpp.inc removes "rosidl-typesupport-opensplice-cpp" from ROS_BUILD_DEPENDS. +ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rosidl-typesupport-opensplice-cpp" diff --git a/includes-ros2/rmw-implementation/rmw-implementation.inc b/includes-ros2/rmw-implementation/rmw-implementation.inc index 58b31b7..e326e5c 100644 --- a/includes-ros2/rmw-implementation/rmw-implementation.inc +++ b/includes-ros2/rmw-implementation/rmw-implementation.inc @@ -1,3 +1,4 @@ # Copyright (c) 2019 LG Electronics, Inc. ROS_BUILD_DEPENDS_remove = "rmw-connext-cpp" +ROS_BUILD_DEPENDS_remove = "rmw-opensplice-cpp" diff --git a/includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc b/includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc index b3fb66a..e189145 100644 --- a/includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc +++ b/includes-ros2/rosidl-typesupport/rosidl-typesupport-c.inc @@ -1,3 +1,4 @@ # Copyright (c) YEAR LG Electronics, Inc. ROS_BUILD_DEPENDS_remove = "rosidl-typesupport-connext-c" +ROS_BUILD_DEPENDS_remove = "rosidl-typesupport-opensplice-c" diff --git a/includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc b/includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc index 0d68bb0..9b1688d 100644 --- a/includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc +++ b/includes-ros2/rosidl-typesupport/rosidl-typesupport-cpp.inc @@ -1,3 +1,4 @@ # Copyright (c) YEAR LG Electronics, Inc. ROS_BUILD_DEPENDS_remove = "rosidl-typesupport-connext-cpp" +ROS_BUILD_DEPENDS_remove = "rosidl-typesupport-opensplice-cpp"