Merge pull request #316 from bulwahn/master-next

work on octomap and README.md

README.md

@@ -160,6 +160,24 @@ Currently, this layer is still under continuous development.
     roscore
 
 
+## CROSS-COMPILING ALL ROS PACKAGES IN meta-ros
+  
+  The meta-ros layers only includes a subset of the officially released ROS
+  packages, available from packages.ros.org. The here provided ROS packages
+  are mainly driven by the current users' needs.
+  
+  For ROS packages that depend on cv-bridge, the commercial license flag
+  must be whitelisted, as cv-bridge depends on opencv, and opencv by
+  default depends on libav that has special terms and conditions when used
+  commercially.
+  This can be done by adding to the local.conf the line: 
+
+    LICENSE_FLAGS_WHITELIST = "commercial"
+
+  Alternatively, the dependency from opencv on libav can be explicit excluded
+  by modifying the PACKAGECONFIG setting.
+
+
 ## LICENSE ##
 
   All metadata is MIT licensed unless otherwise stated. Source code included

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