From dbf49d680501ee3a61ffb895c9d82cf3c4ac996d Mon Sep 17 00:00:00 2001
From: Eunmin Lim <eunmin.lim@lge.com>
Date: Thu, 26 Jul 2018 13:08:00 +0900
Subject: [PATCH] ros2cli: add new recipes

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-ros2/packagegroups/packagegroup-ros2-world.bb | 8 ++++++++
 recipes-ros2/ros2cli/ros2cli.inc                      | 2 ++
 recipes-ros2/ros2cli/ros2cli_git.bb                   | 5 ++---
 recipes-ros2/ros2cli/ros2msg_git.bb                   | 2 +-
 recipes-ros2/ros2cli/ros2node_git.bb                  | 7 +++++++
 recipes-ros2/ros2cli/ros2pkg_git.bb                   | 2 --
 recipes-ros2/ros2cli/ros2run_git.bb                   | 2 --
 recipes-ros2/ros2cli/ros2service_git.bb               | 7 +++++++
 recipes-ros2/ros2cli/ros2srv_git.bb                   | 7 +++++++
 9 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 recipes-ros2/ros2cli/ros2node_git.bb
 create mode 100644 recipes-ros2/ros2cli/ros2service_git.bb
 create mode 100644 recipes-ros2/ros2cli/ros2srv_git.bb

diff --git a/recipes-ros2/packagegroups/packagegroup-ros2-world.bb b/recipes-ros2/packagegroups/packagegroup-ros2-world.bb
index 84f845c..d76ada4 100644
--- a/recipes-ros2/packagegroups/packagegroup-ros2-world.bb
+++ b/recipes-ros2/packagegroups/packagegroup-ros2-world.bb
@@ -7,6 +7,14 @@ PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
     packagegroup-ros2-demos \
+    ros2cli \
+    ros2msg \
+    ros2run \
+    ros2topic \
+    ros2pkg \
+    ros2node \
+    ros2srv \
+    ros2service \
     ros2-launch \
     ros2-actionlib-msgs \
     ros2-diagnostic-msgs \
diff --git a/recipes-ros2/ros2cli/ros2cli.inc b/recipes-ros2/ros2cli/ros2cli.inc
index 1f2a967..c7b6328 100644
--- a/recipes-ros2/ros2cli/ros2cli.inc
+++ b/recipes-ros2/ros2cli/ros2cli.inc
@@ -2,3 +2,5 @@ HOMEPAGE = "https://github.com/ros2/ros2cli"
 
 SRCREV = "df36377ff44695b43390dccf2df5a7bffd012e61"
 SRC_URI = "git://github.com/ros2/ros2cli.git;protocol=git;"
+
+S = "${WORKDIR}/git/${PN}"
diff --git a/recipes-ros2/ros2cli/ros2cli_git.bb b/recipes-ros2/ros2cli/ros2cli_git.bb
index fc57813..4339e72 100644
--- a/recipes-ros2/ros2cli/ros2cli_git.bb
+++ b/recipes-ros2/ros2cli/ros2cli_git.bb
@@ -3,9 +3,8 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=12c26a18c7f493fdc7e8a93b16b7c04f"
 
 include ros2cli.inc
-
-S = "${WORKDIR}/git/ros2cli"
-
 inherit setuptools3
 
 RDEPENDS_${PN} += "rclpy python3-setuptools ${PYTHON_PN}-xmlrpc ${PYTHON_PN}-pydoc"
+
+FILES_${PN} += "${datadir}/ament_index/"
diff --git a/recipes-ros2/ros2cli/ros2msg_git.bb b/recipes-ros2/ros2cli/ros2msg_git.bb
index 38d30ae..0bdff6a 100644
--- a/recipes-ros2/ros2cli/ros2msg_git.bb
+++ b/recipes-ros2/ros2cli/ros2msg_git.bb
@@ -1,4 +1,4 @@
-SUMMARY = "The run command for ROS 2 command line tools."
+SUMMARY = "The msg command for ROS 2 command line tools."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=12c26a18c7f493fdc7e8a93b16b7c04f"
 
diff --git a/recipes-ros2/ros2cli/ros2node_git.bb b/recipes-ros2/ros2cli/ros2node_git.bb
new file mode 100644
index 0000000..59efc02
--- /dev/null
+++ b/recipes-ros2/ros2cli/ros2node_git.bb
@@ -0,0 +1,7 @@
+SUMMARY = "The node command for ROS 2 command line tools."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=12c26a18c7f493fdc7e8a93b16b7c04f"
+
+include ros2cli.inc
+
+inherit setuptools3
diff --git a/recipes-ros2/ros2cli/ros2pkg_git.bb b/recipes-ros2/ros2cli/ros2pkg_git.bb
index fec6a07..58d1a62 100644
--- a/recipes-ros2/ros2cli/ros2pkg_git.bb
+++ b/recipes-ros2/ros2cli/ros2pkg_git.bb
@@ -4,8 +4,6 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=12c26a18c7f49
 
 include ros2cli.inc
 
-S = "${WORKDIR}/git/ros2pkg"
-
 inherit setuptools3
 
 RDEPENDS_${PN} += "ros2cli ament-index-python"
diff --git a/recipes-ros2/ros2cli/ros2run_git.bb b/recipes-ros2/ros2cli/ros2run_git.bb
index 423fde5..7752136 100644
--- a/recipes-ros2/ros2cli/ros2run_git.bb
+++ b/recipes-ros2/ros2cli/ros2run_git.bb
@@ -4,8 +4,6 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=12c26a18c7f49
 
 include ros2cli.inc
 
-S = "${WORKDIR}/git/ros2run"
-
 inherit setuptools3
 
 RDEPENDS_${PN} += "ros2pkg"
diff --git a/recipes-ros2/ros2cli/ros2service_git.bb b/recipes-ros2/ros2cli/ros2service_git.bb
new file mode 100644
index 0000000..621ad45
--- /dev/null
+++ b/recipes-ros2/ros2cli/ros2service_git.bb
@@ -0,0 +1,7 @@
+SUMMARY = "The service command for ROS 2 command line tools."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=12c26a18c7f493fdc7e8a93b16b7c04f"
+
+include ros2cli.inc
+
+inherit setuptools3
diff --git a/recipes-ros2/ros2cli/ros2srv_git.bb b/recipes-ros2/ros2cli/ros2srv_git.bb
new file mode 100644
index 0000000..a88bce6
--- /dev/null
+++ b/recipes-ros2/ros2cli/ros2srv_git.bb
@@ -0,0 +1,7 @@
+SUMMARY = "The srv command for ROS 2 command line tools."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=12c26a18c7f493fdc7e8a93b16b7c04f"
+
+include ros2cli.inc
+
+inherit setuptools3