From f9097a0119760bbabda27eb8bdca0656f245ff9c Mon Sep 17 00:00:00 2001
From: Herb Kuta <herb.kuta@lge.com>
Date: Mon, 25 Mar 2019 12:19:03 -0700
Subject: [PATCH] DRAFT ros_component.bbclass: Move ROS_BPN, ROS_SPN, ROS_SP
 into here from other bbclass-s

---
 classes/ament-python.bbclass      | 4 +---
 classes/ament.bbclass             | 2 --
 classes/catkin_ros_prefix.bbclass | 5 -----
 classes/ros_component.bbclass     | 4 ++++
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/classes/ament-python.bbclass b/classes/ament-python.bbclass
index b789016..70f39c2 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 ed1b57f..4989227 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/catkin_ros_prefix.bbclass b/classes/catkin_ros_prefix.bbclass
index c6ff553..3bf6e28 100644
--- a/classes/catkin_ros_prefix.bbclass
+++ b/classes/catkin_ros_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}"
-
 export ros_prefix = "${base_prefix}/opt/ros/${ROS_DISTRO}"
 
 export ros_bindir = "${ros_prefix}/bin"
diff --git a/classes/ros_component.bbclass b/classes/ros_component.bbclass
index 396393d..51d9c28 100644
--- a/classes/ros_component.bbclass
+++ b/classes/ros_component.bbclass
@@ -6,6 +6,10 @@ export ROS_DISTRO
 export ROS_VERSION
 export ROS_PYTHON_VERSION
 
+ROS_BPN = "${@d.getVar('BPN', True).replace('-', '_')}"
+ROS_SPN ?= "${ROS_BPN}"
+ROS_SP = "${ROS_SPN}-${PV}"
+
 # Ensure that PYTHON_PN is always set. (ROS_PYTHON_VERSION is set in generated-ros-distro.inc, ie, it will never be unset when
 # we get here.)
 inherit ${@'python3-dir' if d.getVar('ROS_PYTHON_VERSION', True) == '3' else 'python-dir'}