From 6eeb185b4c1a848d468041acaa25e9c356b0a84e Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Wed, 18 Feb 2015 07:44:36 +0100 Subject: [PATCH 1/2] 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 --- recipes-ros/octomap/octomap.inc | 13 ------------- recipes-ros/octomap/octomap_1.6.8.bb | 12 +++++++++++- 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 recipes-ros/octomap/octomap.inc diff --git a/recipes-ros/octomap/octomap.inc b/recipes-ros/octomap/octomap.inc deleted file mode 100644 index b3bda0b..0000000 --- a/recipes-ros/octomap/octomap.inc +++ /dev/null @@ -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" diff --git a/recipes-ros/octomap/octomap_1.6.8.bb b/recipes-ros/octomap/octomap_1.6.8.bb index bc05817..c93661e 100644 --- a/recipes-ros/octomap/octomap_1.6.8.bb +++ b/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 From 37913b13b0b701f7fed7f6df4e00887e61d0b207 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Wed, 18 Feb 2015 10:31:13 +0100 Subject: [PATCH 2/2] README.md: informing about setup for cv-bridge --- README.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d40111b..0a25807 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,25 @@ 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