From e20f3c13d05a35359ede425d01c1523bf9bd3fe0 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Fri, 14 Jun 2013 09:34:57 +0200 Subject: [PATCH 1/7] python-rospkg: more precise run-time dependencies --- recipes-devtools/python/python-rospkg_1.0.15.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/python/python-rospkg_1.0.15.bb b/recipes-devtools/python/python-rospkg_1.0.15.bb index f960cac..e01d58e 100644 --- a/recipes-devtools/python/python-rospkg_1.0.15.bb +++ b/recipes-devtools/python/python-rospkg_1.0.15.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "f8be5a9d74f7e656d38b2c3b44b7e367fce4001d613ca3fbfcbb87c493 S = "${WORKDIR}/${SRCNAME}-${PV}" -RDEPENDS_${PN} += "python-modules" +RDEPENDS_${PN} += "python-xml" inherit setuptools From 22f912996b33822c1d33533488afae49349a4c28 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 2 Jul 2013 10:55:47 +0200 Subject: [PATCH 2/7] python-native: extending RPROVIDES for python-rospkg-native The python-rospkg-native rdepends on python-xml-native, and python-native provides this without any further ado. --- recipes-devtools/python/python-native_2.7.3.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 recipes-devtools/python/python-native_2.7.3.bbappend diff --git a/recipes-devtools/python/python-native_2.7.3.bbappend b/recipes-devtools/python/python-native_2.7.3.bbappend new file mode 100644 index 0000000..90bc835 --- /dev/null +++ b/recipes-devtools/python/python-native_2.7.3.bbappend @@ -0,0 +1 @@ +RPROVIDES += "python-xml-native" From 1701e2c08348ed20c0744e600a0f163e0c5eecae Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Fri, 14 Jun 2013 09:27:57 +0200 Subject: [PATCH 3/7] log4cxx: enable native recipe The native log4cxx recipe is required for the recipe dynamic-reconfigure-native. --- recipes-devtools/log4cxx/log4cxx_0.10.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-devtools/log4cxx/log4cxx_0.10.0.bb b/recipes-devtools/log4cxx/log4cxx_0.10.0.bb index c6760e3..106e3b3 100644 --- a/recipes-devtools/log4cxx/log4cxx_0.10.0.bb +++ b/recipes-devtools/log4cxx/log4cxx_0.10.0.bb @@ -10,10 +10,11 @@ SRC_URI = "http://archive.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx- file://0001-log4cxx_0-10-0_add-missing-includes.patch \ file://0002-Remove-duplicates-from-makefile.patch \ file://0003-log4cxx-0.10.0-add_stdio_header.patch" +SRC_URI[md5sum] = "b30ffb8da3665178e68940ff7a61084c" +SRC_URI[sha256sum] = "0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c" -S = "${WORKDIR}/apache-${PN}-${PV}" +S = "${WORKDIR}/apache-${BP}" inherit autotools pkgconfig -SRC_URI[md5sum] = "b30ffb8da3665178e68940ff7a61084c" -SRC_URI[sha256sum] = "0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c" +BBCLASSEXTEND += "native" From ab24fc172d101537ddf49d1261c4a6af4d6a6b09 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 10 Jun 2013 15:03:22 +0200 Subject: [PATCH 4/7] dynamic-reconfigure: initial commit --- .../dynamic-reconfigure_1.5.32.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb diff --git a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb new file mode 100644 index 0000000..be61f0e --- /dev/null +++ b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "\ +This unary stack contains the dynamic_reconfigure package which provides a means to change \ +node parameters at any time without having to restart the node." + +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=5ee5b8b046ae48ad94a2037ca953a67b" + +SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz" +SRC_URI[md5sum] = "9061fd30e5a04e8376eaddffaae86b07" +SRC_URI[sha256sum] = "4203b0a8389d9ac3203110b507d23fa353262cf26253f40abece6418d6c2bdd4" + +DEPENDS = "roscpp std-msgs" +RDEPENDS_${PN} = "roslib" + +S = "${WORKDIR}/${ROS_BP}" + +inherit catkin From b5e768b299a47f08ee9d67698a3e981f15d50145 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 2 Jul 2013 10:48:44 +0200 Subject: [PATCH 5/7] nodelet-core: adding nodelet-topic-tools and refactoring nodelet The nodelet_topic_tools package is required by the pcl_ros package. Common parts of nodelet and nodelet_topic_tools are put into nodelet-core.inc. --- recipes-ros/nodelet-core/nodelet-core.inc | 7 +++++++ recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb | 9 +++++++++ recipes-ros/nodelet-core/nodelet_1.7.15.bb | 8 +------- 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 recipes-ros/nodelet-core/nodelet-core.inc create mode 100644 recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb diff --git a/recipes-ros/nodelet-core/nodelet-core.inc b/recipes-ros/nodelet-core/nodelet-core.inc new file mode 100644 index 0000000..e387a99 --- /dev/null +++ b/recipes-ros/nodelet-core/nodelet-core.inc @@ -0,0 +1,7 @@ +SRC_URI = "https://github.com/ros/nodelet_core/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" +SRC_URI[md5sum] = "840b98ace89034029569f20a2a41af05" +SRC_URI[sha256sum] = "4cc5a76ec90b0610b794128509923beba9b6dee2cb18fdeb6fd3ecc409051262" + +S = "${WORKDIR}/nodelet_core-${PV}/${ROS_BPN}" + +inherit catkin diff --git a/recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb b/recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb new file mode 100644 index 0000000..0072127 --- /dev/null +++ b/recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "This package contains common nodelet tools such as a mux, demux and throttle." + +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" + +DEPENDS = "dynamic-reconfigure-native" + +require nodelet-core.inc diff --git a/recipes-ros/nodelet-core/nodelet_1.7.15.bb b/recipes-ros/nodelet-core/nodelet_1.7.15.bb index 79ecf6b..5a27a75 100644 --- a/recipes-ros/nodelet-core/nodelet_1.7.15.bb +++ b/recipes-ros/nodelet-core/nodelet_1.7.15.bb @@ -11,12 +11,6 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5" -SRC_URI = "https://github.com/ros/nodelet_core/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "840b98ace89034029569f20a2a41af05" -SRC_URI[sha256sum] = "4cc5a76ec90b0610b794128509923beba9b6dee2cb18fdeb6fd3ecc409051262" - DEPENDS = "bondcpp boost message-generation pluginlib rosconsole roscpp rospy std-msgs libtinyxml" -S = "${WORKDIR}/nodelet_core-${PV}/${PN}" - -inherit catkin +require nodelet-core.inc From ff94057affc014059b79bcd9eae306d906c8fd2d Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 10 Jun 2013 15:10:25 +0200 Subject: [PATCH 6/7] libflann: initial commit The flann library is required by the ROS pcl package. --- recipes-extended/libflann/libflann_1.8.4.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes-extended/libflann/libflann_1.8.4.bb diff --git a/recipes-extended/libflann/libflann_1.8.4.bb b/recipes-extended/libflann/libflann_1.8.4.bb new file mode 100644 index 0000000..6ab9824 --- /dev/null +++ b/recipes-extended/libflann/libflann_1.8.4.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "a library for performing fast approximate nearest neighbor searches in high dimensional spaces" +AUTHOR = "Marius Muja and David G. Lowe" +HOMEPAGE = "http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=040a44ba915aa6b3b099ea189c7b7e20" + +SRC_URI = "http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip" +SRC_URI[md5sum] = "a0ecd46be2ee11a68d2a7d9c6b4ce701" +SRC_URI[sha256sum] = "dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08" + +S = "${WORKDIR}/flann-${PV}-src" + +inherit cmake From 0e0fc08eafcf3faf4ce47503bb65627e52b32789 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 4 Jul 2013 11:30:46 +0200 Subject: [PATCH 7/7] 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"