Merge pull request #317 from bulwahn/master-next

tuning und updating

recipes-ros/laser-assembler/laser-assembler/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch

@@ -3,7 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
 Date: Sun, 27 Jul 2014 09:58:36 +0200
 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
 
-Upstream-Status: Submitted
+Upstream-Status: Accepted
 ---
  CMakeLists.txt | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

recipes-ros/navigation/dwa-local-planner/0001-link-only-libraries-found-with-find_package.patch

+From 2cb85fa4b189ea62bc918a5fc54bb6ba73a6e125 Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Thu, 19 Feb 2015 08:18:03 +0100
+Subject: [PATCH] link only libraries found with find_package
+
+When cross-compiling dwa_local_planner with the OpenEmbedded layer
+for ROS, meta-ros [1], I stumbled over the following issue. During
+'Linking CXX shared library devel/lib/libdwa_local_planner.so', the
+g++ call for this linking step includes amongst many other arguments
+these two arguments in this order:
+
+  -lbase_local_planner /[...]/sysroots/qemux86/opt/ros/hydro/lib/libbase_local_planner.so
+
+In the meta-ros setup, the linker aborts with:
+  .../sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/4.9.1/ld: cannot find -lbase_local_planner
+
+The linking fails, because in the cross-compiling scenario,
+-lbase_local_planner is not resolved. However, cmake and the
+find_package command is set up such that the pathes are resolved
+correctly in this setting. To use these correct pathes, the
+link_target_libraries should not hard-code the library name, but
+only use the libraries found with find_package.
+
+Probably, this has not been noticed before, as in the common setup,
+find_package resolved to the hard-coded value.
+
+[1] https://github.com/bmwcarit/meta-ros/
+
+Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+
+Upstream-Status: Submitted [https://github.com/ros-planning/navigation/pull/311]
+---
+ dwa_local_planner/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dwa_local_planner/CMakeLists.txt b/dwa_local_planner/CMakeLists.txt
+index e68286e..6e9a11a 100644
+--- a/dwa_local_planner/CMakeLists.txt
++++ b/dwa_local_planner/CMakeLists.txt
+@@ -42,7 +42,7 @@ catkin_package(
+ )
+ 
+ add_library(dwa_local_planner src/dwa_planner.cpp src/dwa_planner_ros.cpp)
+-target_link_libraries(dwa_local_planner base_local_planner ${catkin_LIBRARIES})
++target_link_libraries(dwa_local_planner ${catkin_LIBRARIES})
+ add_dependencies(dwa_local_planner dwa_local_planner_gencfg)
+ add_dependencies(dwa_local_planner nav_msgs_gencpp)
+ 
+-- 
+1.8.3.2
+

recipes-ros/navigation/dwa-local-planner_1.11.14.bb → recipes-ros/navigation/dwa-local-planner_1.11.15.bb

@@ -8,3 +8,5 @@ DEPENDS = "base-local-planner costmap-2d dynamic-reconfigure libeigen nav-core \
     nav-msgs pluginlib pcl-conversions roscpp tf"
 
 require navigation.inc
+
+SRC_URI += "file://0001-link-only-libraries-found-with-find_package.patch;striplevel=2"

recipes-ros/navigation/navigation.inc

 SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "473df5475e5a289710ba476ceb6d37a5"
-SRC_URI[sha256sum] = "1de48c8d8e5e22287b8be2fb51b470a5cba5d05f49ebbeaa6dfa01392f3d40ae"
+SRC_URI[md5sum] = "441a198ab3223e1cd65df1a74a2520ef"
+SRC_URI[sha256sum] = "747c527c0f7ce880548be81203eab3cb5022e928ca57f672a7a39107cb249c01"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"