From 2f1fde1189d7d6f3dd39870ca27b961df40148a9 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Wed, 13 Mar 2013 17:24:23 +0100 Subject: [PATCH] Use native dependencies for binaries and python scripts All ROS packages with install tools in the bin directory or install python code with is used by other packages should be used as native version. Adapte the DEPENDS accordingly. Signed-off-by: Stefan Herbrechtsmeier --- recipes-ros/gencpp/gencpp_0.4.11.bb | 2 +- recipes-ros/genlisp/genlisp_0.4.10.bb | 2 +- recipes-ros/genpy/genpy_0.4.10.bb | 2 +- recipes-ros/message-generation/message-generation_0.2.9.bb | 2 +- recipes-ros/message-runtime/message-runtime_0.4.11.bb | 2 +- recipes-ros/ros-comm/message-filters_1.9.41.bb | 2 +- recipes-ros/ros-comm/roscpp_1.9.41.bb | 2 +- recipes-ros/ros-comm/rosgraph-msgs_1.9.41.bb | 2 +- recipes-ros/ros-comm/rosnode_1.9.41.bb | 2 +- recipes-ros/ros-comm/rostopic_1.9.41.bb | 2 +- recipes-ros/ros-comm/roswtf_1.9.41.bb | 2 +- recipes-ros/ros-comm/std-srvs_1.9.41.bb | 2 +- recipes-ros/ros-comm/topic-tools_1.9.41.bb | 2 +- recipes-ros/ros/roslib_1.9.42.bb | 2 +- recipes-ros/rospack/rospack_2.1.16.bb | 2 +- recipes-ros/std-msgs/std-msgs_0.5.7.bb | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/recipes-ros/gencpp/gencpp_0.4.11.bb b/recipes-ros/gencpp/gencpp_0.4.11.bb index 574530b..6fa3357 100644 --- a/recipes-ros/gencpp/gencpp_0.4.11.bb +++ b/recipes-ros/gencpp/gencpp_0.4.11.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "genmsg" +DEPENDS = "genmsg-native" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[md5sum] = "be0b3986e98f3370fef4c1fffe3a69f4" diff --git a/recipes-ros/genlisp/genlisp_0.4.10.bb b/recipes-ros/genlisp/genlisp_0.4.10.bb index cf39779..a20b885 100644 --- a/recipes-ros/genlisp/genlisp_0.4.10.bb +++ b/recipes-ros/genlisp/genlisp_0.4.10.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "genmsg" +DEPENDS = "genmsg-native" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[md5sum] = "ae3026fd36a31d286f79a9111450adfa" diff --git a/recipes-ros/genpy/genpy_0.4.10.bb b/recipes-ros/genpy/genpy_0.4.10.bb index eb413cf..13bbd9b 100644 --- a/recipes-ros/genpy/genpy_0.4.10.bb +++ b/recipes-ros/genpy/genpy_0.4.10.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "genmsg" +DEPENDS = "genmsg-native" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[md5sum] = "23915e68167ba6d58c65920bfabd2fad" diff --git a/recipes-ros/message-generation/message-generation_0.2.9.bb b/recipes-ros/message-generation/message-generation_0.2.9.bb index ae7df6d..853b131 100644 --- a/recipes-ros/message-generation/message-generation_0.2.9.bb +++ b/recipes-ros/message-generation/message-generation_0.2.9.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "gencpp" +DEPENDS = "gencpp-native genlisp-native genmsg-native genpy-native" SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz" SRC_URI[md5sum] = "b3086fbe24cc103f412cb30d83362e36" diff --git a/recipes-ros/message-runtime/message-runtime_0.4.11.bb b/recipes-ros/message-runtime/message-runtime_0.4.11.bb index b0b3c31..1cadd8c 100644 --- a/recipes-ros/message-runtime/message-runtime_0.4.11.bb +++ b/recipes-ros/message-runtime/message-runtime_0.4.11.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "gencpp" +DEPENDS = "gencpp-native" SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz" SRC_URI[md5sum] = "10a516326a3bf18f5b5b4523c6e53940" diff --git a/recipes-ros/ros-comm/message-filters_1.9.41.bb b/recipes-ros/ros-comm/message-filters_1.9.41.bb index d664cac..dcd5d8e 100644 --- a/recipes-ros/ros-comm/message-filters_1.9.41.bb +++ b/recipes-ros/ros-comm/message-filters_1.9.41.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "boost rosconsole roscpp rostest rosunit xmlrpcpp" +DEPENDS = "boost rosconsole roscpp rostest-native rosunit-native xmlrpcpp" require ros-comm.inc diff --git a/recipes-ros/ros-comm/roscpp_1.9.41.bb b/recipes-ros/ros-comm/roscpp_1.9.41.bb index 25d8463..87c4e12 100644 --- a/recipes-ros/ros-comm/roscpp_1.9.41.bb +++ b/recipes-ros/ros-comm/roscpp_1.9.41.bb @@ -7,7 +7,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "\ - catkin-native cpp-common message-generation rosconsole roscpp-serialization \ + catkin-native cpp-common message-generation-native rosconsole roscpp-serialization \ roscpp-traits rosgraph-msgs roslang rostime std-msgs xmlrpcpp \ " diff --git a/recipes-ros/ros-comm/rosgraph-msgs_1.9.41.bb b/recipes-ros/ros-comm/rosgraph-msgs_1.9.41.bb index fd282a8..918212f 100644 --- a/recipes-ros/ros-comm/rosgraph-msgs_1.9.41.bb +++ b/recipes-ros/ros-comm/rosgraph-msgs_1.9.41.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "message-generation message-runtime std-msgs" +DEPENDS = "message-generation-native message-runtime-native std-msgs roscpp-serialization" require ros-comm.inc diff --git a/recipes-ros/ros-comm/rosnode_1.9.41.bb b/recipes-ros/ros-comm/rosnode_1.9.41.bb index 766b4e9..89b7480 100644 --- a/recipes-ros/ros-comm/rosnode_1.9.41.bb +++ b/recipes-ros/ros-comm/rosnode_1.9.41.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "rostest" +DEPENDS = "rostest-native" require ros-comm.inc diff --git a/recipes-ros/ros-comm/rostopic_1.9.41.bb b/recipes-ros/ros-comm/rostopic_1.9.41.bb index b8f1a00..69f4b1a 100644 --- a/recipes-ros/ros-comm/rostopic_1.9.41.bb +++ b/recipes-ros/ros-comm/rostopic_1.9.41.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=17;endline=17;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "rostest" +DEPENDS = "rostest-native" require ros-comm.inc diff --git a/recipes-ros/ros-comm/roswtf_1.9.41.bb b/recipes-ros/ros-comm/roswtf_1.9.41.bb index 11cd30a..a321073 100644 --- a/recipes-ros/ros-comm/roswtf_1.9.41.bb +++ b/recipes-ros/ros-comm/roswtf_1.9.41.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "rostest" +DEPENDS = "rostest-native" require ros-comm.inc diff --git a/recipes-ros/ros-comm/std-srvs_1.9.41.bb b/recipes-ros/ros-comm/std-srvs_1.9.41.bb index c7ff85f..b0c7c6c 100644 --- a/recipes-ros/ros-comm/std-srvs_1.9.41.bb +++ b/recipes-ros/ros-comm/std-srvs_1.9.41.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "message-generation genlisp genpy" +DEPENDS = "message-generation-native message-runtime-native" require ros-comm.inc diff --git a/recipes-ros/ros-comm/topic-tools_1.9.41.bb b/recipes-ros/ros-comm/topic-tools_1.9.41.bb index b8f1a00..69f4b1a 100644 --- a/recipes-ros/ros-comm/topic-tools_1.9.41.bb +++ b/recipes-ros/ros-comm/topic-tools_1.9.41.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=17;endline=17;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "rostest" +DEPENDS = "rostest-native" require ros-comm.inc diff --git a/recipes-ros/ros/roslib_1.9.42.bb b/recipes-ros/ros/roslib_1.9.42.bb index 619a386..5fddf5a 100644 --- a/recipes-ros/ros/roslib_1.9.42.bb +++ b/recipes-ros/ros/roslib_1.9.42.bb @@ -3,7 +3,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "boost rospack" +DEPENDS = "boost rospack-native rospack" require ros.inc diff --git a/recipes-ros/rospack/rospack_2.1.16.bb b/recipes-ros/rospack/rospack_2.1.16.bb index 456fe72..7ffa439 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 libtinyxml" +DEPENDS = "boost python-native libtinyxml" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[md5sum] = "1383bdce36fe6319884e7b158c22d8b4" diff --git a/recipes-ros/std-msgs/std-msgs_0.5.7.bb b/recipes-ros/std-msgs/std-msgs_0.5.7.bb index 1178dbd..e636d24 100644 --- a/recipes-ros/std-msgs/std-msgs_0.5.7.bb +++ b/recipes-ros/std-msgs/std-msgs_0.5.7.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=5ee5b8b046ae48ad94a2037ca953a67b" -DEPENDS = "message-generation genlisp genpy" +DEPENDS = "message-generation-native message-runtime-native" SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz" SRC_URI[md5sum] = "ea40e6dd8ea19fe54a2b476358c0ceea"