From 30b876dd6cfec8deff62320afef90bc12374784d Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Wed, 5 Jun 2019 10:38:22 -0700 Subject: [PATCH] DRAFT {dashing} libyaml-vendor: PROVIDE/RPROVIDE libyaml --- .../include/dashing/ros-distro-preferred-providers.inc | 4 ++++ .../include/dashing/ros-distro-recipe-blacklist.inc | 3 +++ includes-ros2/libyaml-vendor/libyaml-vendor.inc | 3 +++ 3 files changed, 10 insertions(+) diff --git a/conf/ros-distro/include/dashing/ros-distro-preferred-providers.inc b/conf/ros-distro/include/dashing/ros-distro-preferred-providers.inc index 5074ea3..8ce0274 100644 --- a/conf/ros-distro/include/dashing/ros-distro-preferred-providers.inc +++ b/conf/ros-distro/include/dashing/ros-distro-preferred-providers.inc @@ -4,3 +4,7 @@ # Set PREFERRED_PROVIDER_ here for non-platform packages and to override those set in # ros-distro-platform-preferred-providers.inc . + +PREFERRED_PROVIDER_libyaml = "libyaml-vendor" +PREFERRED_PROVIDER_libyaml-dev = "libyaml-vendor-dev" +PREFERRED_PROVIDER_libyaml-dbg = "libyaml-vendor-dbg" diff --git a/conf/ros-distro/include/dashing/ros-distro-recipe-blacklist.inc b/conf/ros-distro/include/dashing/ros-distro-recipe-blacklist.inc index 3652681..f474ee2 100644 --- a/conf/ros-distro/include/dashing/ros-distro-recipe-blacklist.inc +++ b/conf/ros-distro/include/dashing/ros-distro-recipe-blacklist.inc @@ -45,3 +45,6 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_remove = "rmw-opensplice-cpp" 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" + +# Others +PNBLACKLIST[libyaml] ?= "Provided by libyaml-vendor" diff --git a/includes-ros2/libyaml-vendor/libyaml-vendor.inc b/includes-ros2/libyaml-vendor/libyaml-vendor.inc index 05fc917..496f88b 100644 --- a/includes-ros2/libyaml-vendor/libyaml-vendor.inc +++ b/includes-ros2/libyaml-vendor/libyaml-vendor.inc @@ -5,3 +5,6 @@ SYSROOT_DIRS_append = " ${prefix}/cmake" PROVIDES_crystal += "libyaml" RPROVIDES_${PN}_crystal += "libyaml" + +PROVIDES_dashing += "libyaml" +RPROVIDES_${PN}_dashing += "libyaml"