octomap: simplifying recipe

When I investigated the issue #291 with Kristof's patch applied,
I noticed that `bitbake octomap` failed.

Due to my inspection, I believe that the inheritance on ros
was only needed as the ROS_SPN and ROS_SP variables were used in
the recipe. After simply using the default variables, BPN and BP,
I removed the inheritance on ros.

Furthermore, as meta-ros only has one recipe for octomap base
library for now, we do not need to split the recipe definition
in an include and a recipe file.
Probably, this was done as premature optimization believing
that the libraries from the octomap repository, e.g., octovis,
would be added shortly after.

Testing with `bitbake packagegroup-ros-world` reported no errors.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>

recipes-ros/octomap/octomap.inc

@@ -1,13 +0,0 @@
-SRC_URI = "https://github.com/OctoMap/${ROS_SPN}/archive/v${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "e4f9ab54fecfc031ec160b8989340804"
-SRC_URI[sha256sum] = "833adba0d3b203cab0e28a0180490e74bc852a7fea9adf6ee53bbfb8f10bc79a"
-
-S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
-
-EXTRA_OECMAKE += "\
-    -DCMAKE_SKIP_RPATH=ON \
-"
-
-inherit cmake ros
-
-ROS_SPN = "octomap"

recipes-ros/octomap/octomap_1.6.8.bb

@@ -3,4 +3,14 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9b0e1f01a68f441eeaf7b5e18812d3c8"
 
-require octomap.inc
+SRC_URI = "https://github.com/OctoMap/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
+SRC_URI[md5sum] = "e4f9ab54fecfc031ec160b8989340804"
+SRC_URI[sha256sum] = "833adba0d3b203cab0e28a0180490e74bc852a7fea9adf6ee53bbfb8f10bc79a"
+
+S = "${WORKDIR}/${BP}/${BPN}"
+
+EXTRA_OECMAKE += "\
+    -DCMAKE_SKIP_RPATH=ON \
+"
+
+inherit cmake