From 0e0fc08eafcf3faf4ce47503bb65627e52b32789 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Thu, 4 Jul 2013 11:30:46 +0200
Subject: [PATCH] adjusting dependencies of native recipes

To compile nodelet-topic-tools, we must provide a working
dynamic-reconfigure in the native sysroot. This requires
some adjustments to the native versions of the required
python modules.

In particular, the following tasks ran successfully for this
commit:

This command tests compiling rospack-native:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake rospack-native

This command tests compiling roslib-native:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake roslib-native

As nodelet-topic-tools uses rospack-native and roslib-native to
some extent (dependency: rospack-native -> roslib-native ->
dynamic-reconfigure-native -> nodelet-topic-tools), this command
tests running rospack-native and roslib-native:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake nodelet-topic-tools

This command tests compiling rospack and roslib:
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake rospack
rm bitbake.lock cache/ sstate-cache/ tmp-eglibc/ -rf && bitbake roslib

All these command run with this commit without errors, and
future commits to these files should keep them run without
errors or justify modifications with better tests.

A minor open issue related to rospack is issue #116
(cf. https://github.com/bmwcarit/meta-ros/issues/116).

This commit incorporates feedback from Stefan Herbrechtsmeier.
---
 recipes-devtools/python/python-rospkg_1.0.15.bb               | 1 -
 recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb | 2 +-
 recipes-ros/rospack/rospack_2.1.16.bb                         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes-devtools/python/python-rospkg_1.0.15.bb b/recipes-devtools/python/python-rospkg_1.0.15.bb
index e01d58e..a38a210 100644
--- a/recipes-devtools/python/python-rospkg_1.0.15.bb
+++ b/recipes-devtools/python/python-rospkg_1.0.15.bb
@@ -15,6 +15,5 @@ RDEPENDS_${PN} += "python-xml"
 inherit setuptools
 
 DEPENDS += "python"
-DEPENDS_class-native  += "python-native"
 BBCLASSEXTEND = "native"
 
diff --git a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb
index be61f0e..1ba7673 100644
--- a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb
+++ b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb
@@ -10,7 +10,7 @@ SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilena
 SRC_URI[md5sum] = "9061fd30e5a04e8376eaddffaae86b07"
 SRC_URI[sha256sum] = "4203b0a8389d9ac3203110b507d23fa353262cf26253f40abece6418d6c2bdd4"
 
-DEPENDS = "roscpp std-msgs"
+DEPENDS = "roscpp std-msgs roslib"
 RDEPENDS_${PN} = "roslib"
 
 S = "${WORKDIR}/${ROS_BP}"
diff --git a/recipes-ros/rospack/rospack_2.1.16.bb b/recipes-ros/rospack/rospack_2.1.16.bb
index 7ffa439..3a5478a 100644
--- a/recipes-ros/rospack/rospack_2.1.16.bb
+++ b/recipes-ros/rospack/rospack_2.1.16.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "boost python-native libtinyxml"
+DEPENDS = "boost python-rospkg-native libtinyxml"
 
 SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
 SRC_URI[md5sum] = "1383bdce36fe6319884e7b158c22d8b4"
-- 
GitLab