From 2817bf4c23df96cbd465752a98d2cf9515dc4cb3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Feb 2020 09:44:06 -0800 Subject: [PATCH] {melodic} kobuki-ftdi: blacklist because of dependency on old libftdi * issue reported upstream: https://github.com/kobuki-base/kobuki_ftdi/issues/3 * remove the dependency from kobuki-core to resolve: ERROR: Nothing PROVIDES 'kobuki-ftdi' (but /jenkins/mjansa/build-ros/ros1-melodic-thud/meta-ros/meta-ros1-melodic/generated-recipes/kobuki-core/kobuki-core_0.7.8.bb DEPENDS on or otherwise requires it) No eligible PROVIDERs exist for 'kobuki-ftdi' Signed-off-by: Martin Jansa --- .../recipes-bbappends/kobuki-core/kobuki-core_%.bbappend | 5 +++++ .../recipes-bbappends/kobuki-core/kobuki-ftdi_0.7.8.bbappend | 2 ++ .../packagegroups/packagegroup-ros-world-melodic.bb | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-core_%.bbappend diff --git a/meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-core_%.bbappend b/meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-core_%.bbappend new file mode 100644 index 00000000000..4fce0361b30 --- /dev/null +++ b/meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-core_%.bbappend @@ -0,0 +1,5 @@ +# Copyright (c) 2020 LG Electronics, Inc. + +# kobuki-ftdi is blacklisted +ROS_EXPORT_DEPENDS_remove = "kobuki-ftdi" +ROS_EXEC_DEPENDS_remove = "kobuki-ftdi" diff --git a/meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-ftdi_0.7.8.bbappend b/meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-ftdi_0.7.8.bbappend index c5bb86bdb1c..0f37dc6096d 100644 --- a/meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-ftdi_0.7.8.bbappend +++ b/meta-ros1-melodic/recipes-bbappends/kobuki-core/kobuki-ftdi_0.7.8.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-ros1-melodic/recipes-core/packagegroups/packagegroup-ros-world-melodic.bb b/meta-ros1-melodic/recipes-core/packagegroups/packagegroup-ros-world-melodic.bb index 7da31b02e57..382b6edcd2c 100644 --- a/meta-ros1-melodic/recipes-core/packagegroups/packagegroup-ros-world-melodic.bb +++ b/meta-ros1-melodic/recipes-core/packagegroups/packagegroup-ros-world-melodic.bb @@ -39,6 +39,9 @@ RDEPENDS_${PN}_remove = "odom-frame-publisher" # Fetches depot_tools during do_configure and then tries to use vpython which isn't in dependencies RDEPENDS_${PN}_remove = "webrtc" +# Not compatible with newer libftdi included in meta-oe: https://github.com/kobuki-base/kobuki_ftdi/issues/3 +RDEPENDS_${PN}_remove = "kobuki-ftdi" + RDEPENDS_${PN}_remove = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'qt5', '${ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_META_QT5}', '', d)}" ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_META_QT5 = " \