diff --git a/classes/ament-python.bbclass b/classes/ament-python.bbclass index b7890167488..70f39c2c701 100644 --- a/classes/ament-python.bbclass +++ b/classes/ament-python.bbclass @@ -1,6 +1,4 @@ -# Copyright (c) 2018 LG Electronics, Inc. - -ROS_BPN ?= "${@d.getVar('BPN', True).replace('-', '_')}" +# Copyright (c) 2018-2019 LG Electronics, Inc. S = "${WORKDIR}/git/${ROS_BPN}" diff --git a/classes/ament.bbclass b/classes/ament.bbclass index ed1b57fa413..4989227b0b8 100644 --- a/classes/ament.bbclass +++ b/classes/ament.bbclass @@ -18,8 +18,6 @@ DEPENDS_append = " \ ament-cmake-test-native \ " -ROS_BPN ?= "${@d.getVar('BPN', True).replace('-', '_')}" - S = "${WORKDIR}/git/${ROS_BPN}" EXTRA_OECMAKE_append = " -DBUILD_TESTING=OFF -DPYTHON_SOABI=cpython-35m-${TUNE_ARCH}-${TARGET_OS}${ARMPKGSFX_EABI}" diff --git a/classes/ros_component.bbclass b/classes/ros_component.bbclass index 90bb38a0734..88d3238b0ce 100644 --- a/classes/ros_component.bbclass +++ b/classes/ros_component.bbclass @@ -10,6 +10,10 @@ export ROS_PYTHON_VERSION # in generated-ros-distro.inc, ie, it will never be unset when we get here. PYTHON_PN ??= "${@'python3' if d.getVar('ROS_PYTHON_VERSION', True) == '3' else 'python'}" +ROS_BPN = "${@d.getVar('BPN', True).replace('-', '_')}" +ROS_SPN ?= "${ROS_BPN}" +ROS_SP = "${ROS_SPN}-${PV}" + inherit faulty-solibs FILES_${PN}_prepend = " \ ${datadir}/${ROS_BPN} \ diff --git a/classes/ros_opt_prefix.bbclass b/classes/ros_opt_prefix.bbclass index b8ec16f23f0..9f29c854c45 100644 --- a/classes/ros_opt_prefix.bbclass +++ b/classes/ros_opt_prefix.bbclass @@ -3,11 +3,6 @@ # Copyright (c) 2019 LG Electronics, Inc. # -ROS_BPN = "${@d.getVar('BPN', True).replace('-', '_')}" - -ROS_SPN ?= "${ROS_BPN}" -ROS_SP = "${ROS_SPN}-${PV}" - ros_prefix = "${base_prefix}/opt/ros/${ROS_DISTRO}" ros_bindir = "${ros_prefix}/bin"