From 13a4cc1fe296553fc94f9121e9999e0ef0af6505 Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Wed, 1 May 2019 19:28:08 -0700 Subject: [PATCH] TEMP console-bridge: Provide v0.4.2 for crystal, bionic v0.4.0 for melodic, bouncy crystal console-bridge-vendor builds v0.4.1 if version is earlier, but its console-bridge.pc has Version: 0.4.0 => fixed in v0.4.2 . Eventually fix console-bridge-vendor.pc not to have a bad path and revert this commit. --- .../crystal/ros-distro-preferred-versions.inc | 3 +++ .../console-bridge/console-bridge_0.4.2.bb | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 recipes-extended/console-bridge/console-bridge_0.4.2.bb diff --git a/conf/ros-distro/include/crystal/ros-distro-preferred-versions.inc b/conf/ros-distro/include/crystal/ros-distro-preferred-versions.inc index 7665b56..24b0330 100644 --- a/conf/ros-distro/include/crystal/ros-distro-preferred-versions.inc +++ b/conf/ros-distro/include/crystal/ros-distro-preferred-versions.inc @@ -4,3 +4,6 @@ # Set PREFERRED_VERSION_ here for non-platform packages for which the layers provide multiple versions and to override those # set in ros-distro-platform-preferred-versions.inc . + +# console-bridge-vendor expects this version (or it will build it itself): +PREFERRED_VERSION_console-bridge = "0.4.2" diff --git a/recipes-extended/console-bridge/console-bridge_0.4.2.bb b/recipes-extended/console-bridge/console-bridge_0.4.2.bb new file mode 100644 index 0000000..0826925 --- /dev/null +++ b/recipes-extended/console-bridge/console-bridge_0.4.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "console_bridge is a ROS-independent, pure CMake package that provides logging \ +calls that mirror those found in rosconsole, but for applications that are not necessarily using \ +ROS." +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "\ + file://include/console_bridge/console.h;beginline=1;endline=33;md5=279eed49072cc9f6ebe38974afcc4803 \ + file://src/console.cpp;beginline=1;endline=33;md5=279eed49072cc9f6ebe38974afcc4803 \ +" + +DEPENDS = "boost" + +ROS_BPN = "console_bridge" +ROS_SPN = "${ROS_BPN}" +ROS_SP = "${ROS_BPN}-${PV}" + +SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" +SRC_URI[md5sum] = "12e9a6b876ef160fc4a705003790ede0" +SRC_URI[sha256sum] = "f44641bed7268d72354476c8c5ff936f0e600e4170e1ff7f61a4b6e1f3fc20ff" + +S = "${WORKDIR}/${ROS_SP}" + +inherit cmake + +# For some reason, the cmake subdir is under ${libdir} instead of ${datadir} for this component. +FILES_${PN}-dev += "${libdir}/${ROS_BPN}/cmake"