From 2ba8f7db398aed979ee15f008e947299421cd6fc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Feb 2020 09:44:06 -0800 Subject: [PATCH] {eloquent} kobuki-ftdi: blacklist because of dependency on old libftdi * issue reported upstream: https://github.com/kobuki-base/kobuki_ftdi/issues/3 Signed-off-by: Martin Jansa --- .../recipes-bbappends/kobuki-core/kobuki-ftdi_1.0.0-1.bbappend | 2 ++ .../packagegroups/packagegroup-ros-world-eloquent.bb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/meta-ros2-eloquent/recipes-bbappends/kobuki-core/kobuki-ftdi_1.0.0-1.bbappend b/meta-ros2-eloquent/recipes-bbappends/kobuki-core/kobuki-ftdi_1.0.0-1.bbappend index c5bb86bdb1c..0f37dc6096d 100644 --- a/meta-ros2-eloquent/recipes-bbappends/kobuki-core/kobuki-ftdi_1.0.0-1.bbappend +++ b/meta-ros2-eloquent/recipes-bbappends/kobuki-core/kobuki-ftdi_1.0.0-1.bbappend @@ -2,3 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://0001-CMakeLists-update-libusb-libftdi-pkg-config-names-to.patch" + +PNBLACKLIST[kobuki-ftdi] ?= "Not compatible with newer libftdi included in meta-oe: https://github.com/kobuki-base/kobuki_ftdi/issues/3" diff --git a/meta-ros2-eloquent/recipes-core/packagegroups/packagegroup-ros-world-eloquent.bb b/meta-ros2-eloquent/recipes-core/packagegroups/packagegroup-ros-world-eloquent.bb index 315aa52fc56..815117808b9 100644 --- a/meta-ros2-eloquent/recipes-core/packagegroups/packagegroup-ros-world-eloquent.bb +++ b/meta-ros2-eloquent/recipes-core/packagegroups/packagegroup-ros-world-eloquent.bb @@ -16,6 +16,9 @@ RDEPENDS_${PN}_remove = "spatio-temporal-voxel-layer" # Depends on coin-or libcbc for which we don't have recipes yet RDEPENDS_${PN}_remove = "popf plansys2-executor plansys2-terminal plansys2-multidomain-example plansys2-simple-example plansys2-patrol-navigation-example" +# Depends on older libftdi than what we have in meta-oe +RDEPENDS_${PN}_remove = "kobuki-ftdi" + # "rmw-fastrtps-dynamic-cpp" is mentioned in http://www.ros.org/reps/rep-2000.html, so make sure we always build it (it appears in # ROS_SUPERFLORE_GENERATED_TESTS, so it's not been added to ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES). RDEPENDS_${PN}_append = " rmw-fastrtps-dynamic-cpp"