From c1fcaff73bd3d09f2f3b4818af61eaefe48798a6 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 23 Feb 2015 06:57:15 +0100 Subject: [PATCH 1/9] dwa-local-planner: updating patch's upstream status --- .../0001-link-only-libraries-found-with-find_package.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-ros/navigation/dwa-local-planner/0001-link-only-libraries-found-with-find_package.patch b/recipes-ros/navigation/dwa-local-planner/0001-link-only-libraries-found-with-find_package.patch index 36a6e45..5e68ecf 100644 --- a/recipes-ros/navigation/dwa-local-planner/0001-link-only-libraries-found-with-find_package.patch +++ b/recipes-ros/navigation/dwa-local-planner/0001-link-only-libraries-found-with-find_package.patch @@ -28,7 +28,7 @@ find_package resolved to the hard-coded value. Signed-off-by: Lukas Bulwahn -Upstream-Status: Submitted [https://github.com/ros-planning/navigation/pull/311] +Upstream-Status: Accepted [in indigo-devel branch] --- dwa_local_planner/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From 2ade7620c54a2f60bd228dda6df342e1a6c212b0 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 23 Feb 2015 06:58:09 +0100 Subject: [PATCH 2/9] packagegroup-ros-world: completing package list --- recipes-ros/packagegroups/packagegroup-ros-world.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-ros/packagegroups/packagegroup-ros-world.bb b/recipes-ros/packagegroups/packagegroup-ros-world.bb index 70b1786..5adba35 100644 --- a/recipes-ros/packagegroups/packagegroup-ros-world.bb +++ b/recipes-ros/packagegroups/packagegroup-ros-world.bb @@ -152,6 +152,7 @@ RDEPENDS_${PN} = "\ roslint \ ros-pocketsphinx \ sound-play \ + rt-tests-support \ communication-tests \ cyclic-timer-tests \ oneshot-timer-tests \ @@ -163,6 +164,11 @@ RDEPENDS_${PN} = "\ ar-track-alvar \ razor-imu-9dof \ xv-11-laser-driver \ + ros-arduino-firmware \ + ros-arduino-msgs \ + ros-arduino-python \ + frontier-exploration \ + hector-mapping \ " # joint-state-publisher still has some issues. From 0b5907495d1a609ce7479c636dc871a705b63795 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 23 Feb 2015 07:08:01 +0100 Subject: [PATCH 3/9] README.md: acknowledge recent contributors --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0a25807..a26941d 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,12 @@ Currently, this layer is still under continuous development. * Khem Raj * Esteve Fernandez * Jonas Sticha + * Pascal Bach + * Andreas Galauner + * Peter S. Housel + * Gauthier Monserand + * Timo Mueller + * Andreas Baak ## HOW TO CONTRIBUTE ## From beb467747d2e9a260ecddd3fcd49d4d6036e1346 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 23 Feb 2015 07:36:46 +0100 Subject: [PATCH 4/9] catkin: including root path in library search (addresses #291) On the meta-ros issue tracker, the issue #291 reports a linking problem with rosconsole if ROS Hydro is also installed on the host system. Kristof investigated in that, and published a patch [1] on September 27th, 2014, which resolved the rosconsole issue, but showed issues with urdfdom. After reading through the discussion of issue #291, I started initial testing with Kristof's patch. After testing Kristof's patch, I also investigated the urdfdom problem, and came up with the solution to revert the part of his patch, which moved `-DCMAKE_INSTALL_PREFIX:PATH='${ros_prefix}'` to ros.bbclass. Initially, I believed that the issue that was addressed with the second part of Kristof's patch, has been resolved with commit 7e2eb25e515efb2cadf570f7db9b044f9da5c424. However, the issue remains, but is only reproducible with the Ubuntu saucy distribution. On my first local setup, I could reproduce the issue #291 with rosconsole on commit 47eab4263c26a15e8dd336001fec914ab128d633. After applying this commit, the issue with rosconsole did not occur anymore on a clean fresh build. `bitbake packagegroup-ros-world` did not show any other further issues. On my second local setup, on a newly-installed Ubuntu 12.04 (precise) system, I checked that the proposed commit resolves some linking problems to boost, with some latest OpenEmbedded-Core repository and the poky-dizzy distribution. A detailed report of the investigation of this second local setup is at my Github Gist [2]. In the first review of the pull request #318, Kristof noticed that on an Ubuntu 13.10 (saucy), an issue with message-filters still occurs. I could not reproduce this and other reported errors on the Ubuntu 12.04 system, so I believe certain errors only appear on certain Ubuntu distributions, which makes them difficult to pinpoint. Therefore, we decided to defer the resolution of this problem with Ubuntu 13.10. To adjust to the concurrent work in pull request #319, during the rebasing, the patch has been moved from the catkin directory to the files directory. Kristof remains the author of the applied patch, as I have not modified the patch. I have put myself as this author's commit, as I take the responsibility of the modifications compared to Kristof's original work and I have tested this commit in my test setting. [1] https://github.com/KristofRobot/meta-ros/commit/9ff76ffb7a5aaa076a89a378e92d41adbfeb9b38 [2] https://gist.github.com/bulwahn/a8d5b7c27550b399f866 Signed-off-by: Lukas Bulwahn catkin: move to files directory (fixup) --- recipes-ros/catkin/catkin.inc | 3 +- ...CONFIG_LIB_PATHS-use-cmake-root-path.patch | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 recipes-ros/catkin/files/0002-PKG_CONFIG_LIB_PATHS-use-cmake-root-path.patch diff --git a/recipes-ros/catkin/catkin.inc b/recipes-ros/catkin/catkin.inc index 6397868..1173eab 100644 --- a/recipes-ros/catkin/catkin.inc +++ b/recipes-ros/catkin/catkin.inc @@ -9,7 +9,8 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena SRC_URI[md5sum] = "a0dd74c4a665a56b02af9f8c873c451d" SRC_URI[sha256sum] = "71441206945e8d77dace831375effde5b5f54b95e3a054106848432eceec58c0" -SRC_URI += "file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch" +SRC_URI += "file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch\ + file://0002-PKG_CONFIG_LIB_PATHS-use-cmake-root-path.patch" inherit catkin diff --git a/recipes-ros/catkin/files/0002-PKG_CONFIG_LIB_PATHS-use-cmake-root-path.patch b/recipes-ros/catkin/files/0002-PKG_CONFIG_LIB_PATHS-use-cmake-root-path.patch new file mode 100644 index 0000000..2500cfb --- /dev/null +++ b/recipes-ros/catkin/files/0002-PKG_CONFIG_LIB_PATHS-use-cmake-root-path.patch @@ -0,0 +1,28 @@ +From 25b1c65090ece840e29844253577d7ed6dc8251f Mon Sep 17 00:00:00 2001 +From: Kristof Robot +Date: Thu, 21 Aug 2014 12:48:41 +0200 +Subject: [PATCH] catkin: including root path in library search + +Upstream-Status: Inappropriate [only for our setup] + +Signed-off-by: Kristof Robot +--- + cmake/templates/pkgConfig.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in +index 91f6d65..f7bf2b2 100644 +--- a/cmake/templates/pkgConfig.cmake.in ++++ b/cmake/templates/pkgConfig.cmake.in +@@ -125,7 +125,7 @@ foreach(library ${libraries}) + foreach(path @PKG_CONFIG_LIB_PATHS@) + find_library(lib ${library} + PATHS ${path} +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) ++ NO_DEFAULT_PATH) + if(lib) + set(lib_path ${path}) + break() +-- +1.8.3.2 + From 40c4945b077c291c07020a8f47d939ac7f189430 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 30 Mar 2015 06:52:06 +0200 Subject: [PATCH 5/9] gscam: updating the patch's upstream status --- ...1-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-ros/gscam/gscam/0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch b/recipes-ros/gscam/gscam/0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch index 575d4eb..0165930 100644 --- a/recipes-ros/gscam/gscam/0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch +++ b/recipes-ros/gscam/gscam/0001-gscam_nodelet.h-include-scoped_ptr.hpp-to-compile-wi.patch @@ -30,7 +30,7 @@ configurations. Signed-off-by: Lukas Bulwahn -Upstream-Status: Submitted [https://github.com/ros-drivers/gscam/pull/24] +Upstream-Status: Accepted --- include/gscam/gscam_nodelet.h | 1 + 1 file changed, 1 insertion(+) From be6640c11a20c8892768c414d5f3ef9cf7a0e4cf Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 30 Mar 2015 07:00:51 +0200 Subject: [PATCH 6/9] razor-imu-9dof: updating to 1.1.0 In version 1.1.0, razor-imu-9dof depends on dynamic-reconfigure. --- .../{razor-imu-9dof_1.0.5.bb => razor-imu-9dof_1.1.0.bb} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename recipes-ros/razor-imu-9dof/{razor-imu-9dof_1.0.5.bb => razor-imu-9dof_1.1.0.bb} (79%) diff --git a/recipes-ros/razor-imu-9dof/razor-imu-9dof_1.0.5.bb b/recipes-ros/razor-imu-9dof/razor-imu-9dof_1.1.0.bb similarity index 79% rename from recipes-ros/razor-imu-9dof/razor-imu-9dof_1.0.5.bb rename to recipes-ros/razor-imu-9dof/razor-imu-9dof_1.1.0.bb index e27691f..029ad3a 100644 --- a/recipes-ros/razor-imu-9dof/razor-imu-9dof_1.0.5.bb +++ b/recipes-ros/razor-imu-9dof/razor-imu-9dof_1.1.0.bb @@ -7,9 +7,11 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" +DEPENDS = "dynamic-reconfigure" + SRC_URI = "https://github.com/KristofRobot/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "3a05ce324d043400a2a214bcc040f843" -SRC_URI[sha256sum] = "4a948cc34e36ce5be9c3e4a2e681eed713e1a5a3df674dd4761a0795e607da35" +SRC_URI[md5sum] = "8b82e5752d5d4f788e87b434ffee6a39" +SRC_URI[sha256sum] = "97dac4e4d287b41d40aa9c1a4bb09f716e244a49f928cfc1ec31a9d2962965f9" S = "${WORKDIR}/${ROS_SP}" From fdef05ee5e2869de72e9b08fbf5af0fab8808760 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 30 Mar 2015 07:00:59 +0200 Subject: [PATCH 7/9] genlisp: updating to 0.4.15 --- recipes-ros/genlisp/{genlisp_0.4.14.bb => genlisp_0.4.15.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/genlisp/{genlisp_0.4.14.bb => genlisp_0.4.15.bb} (70%) diff --git a/recipes-ros/genlisp/genlisp_0.4.14.bb b/recipes-ros/genlisp/genlisp_0.4.15.bb similarity index 70% rename from recipes-ros/genlisp/genlisp_0.4.14.bb rename to recipes-ros/genlisp/genlisp_0.4.15.bb index 1a0579c..e2294dc 100644 --- a/recipes-ros/genlisp/genlisp_0.4.14.bb +++ b/recipes-ros/genlisp/genlisp_0.4.15.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de DEPENDS = "genmsg" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "03f0c73d79e35d4704289b18e4e4b6f2" -SRC_URI[sha256sum] = "c12ae21100b11635672c17bdeb165c17ae74bddf4ce8f9bc97711fed0eef9698" +SRC_URI[md5sum] = "74ae3d474fe0d8c7d67f85039a6a0b57" +SRC_URI[sha256sum] = "cc170a66f92e17945168479974ba24ed6970e9f09eb555b0225a99d339e22a5a" inherit catkin From 3727c70ccfc3e10e68b25ebefa6072fc6f7035ec Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 30 Mar 2015 07:47:47 +0200 Subject: [PATCH 8/9] python: making bbappend files version independent In the recent commit d4ad95f0 [1], the OpenEmbedded-Core repository updated python from version 2.7.3 to 2.7.9. To make meta-ros compatible to the latest commits, the bbappend files are renamed to be version independent. [1] http://cgit.openembedded.org/openembedded-core/commit/?id=d4ad95f0d5f08891637c644e85b09da9c4585059 Signed-off-by: Lukas Bulwahn --- .../{python-native_2.7.3.bbappend => python-native_%.bbappend} | 0 .../python/{python_2.7.3.bbappend => python_%.bbappend} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename recipes-devtools/python/{python-native_2.7.3.bbappend => python-native_%.bbappend} (100%) rename recipes-devtools/python/{python_2.7.3.bbappend => python_%.bbappend} (100%) diff --git a/recipes-devtools/python/python-native_2.7.3.bbappend b/recipes-devtools/python/python-native_%.bbappend similarity index 100% rename from recipes-devtools/python/python-native_2.7.3.bbappend rename to recipes-devtools/python/python-native_%.bbappend diff --git a/recipes-devtools/python/python_2.7.3.bbappend b/recipes-devtools/python/python_%.bbappend similarity index 100% rename from recipes-devtools/python/python_2.7.3.bbappend rename to recipes-devtools/python/python_%.bbappend From c31be9bd37e6de4d634a1ef73731bcd362513dfc Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 30 Mar 2015 17:36:12 +0200 Subject: [PATCH 9/9] python-rosdep: adding new dependency due to update When compiling python-rosdep before python-nose has been built, 'bitbake python-rosdep' fails with: | distutils.errors.DistutilsError: Could not find suitable distribution for Requirement.parse('nose>=1.0') | ERROR: python setup.py build_ext execution failed. | WARNING: /[...]/build/tmp-glibc/work/i586-oe-linux/python-rosdep/0.11.0-r0/temp/run.do_compile.14813:1 exit 1 from | exit 1 | ERROR: Function failed: do_compile (log file is located at /[...]/build/tmp-glibc/work/i586-oe-linux/python-rosdep/0.11.0-r0/temp/log.do_compile.14813) ERROR: Task 6 (/[...]/meta-ros/recipes-devtools/python/python-rosdep_0.11.0.bb, do_compile) failed with exit code '1' In a recent commit in the rosdep repository [1], the dependency for the rosdep setup on python's nose package is added. Hence, we must also add this dependency in the rosdep recipe, which then resolves the reported failure. [1] https://github.com/ros-infrastructure/rosdep/commit/fc8b56be072ab672344c747de815daaacf2e9834 Signed-off-by: Lukas Bulwahn --- recipes-devtools/python/python-rosdep_0.11.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-devtools/python/python-rosdep_0.11.0.bb b/recipes-devtools/python/python-rosdep_0.11.0.bb index 0ae9a62..3fa41c2 100644 --- a/recipes-devtools/python/python-rosdep_0.11.0.bb +++ b/recipes-devtools/python/python-rosdep_0.11.0.bb @@ -4,6 +4,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" SRCNAME = "rosdep" +DEPENDS = "python-nose" + SRC_URI = "http://pypi.python.org/packages/source/r/rosdep/rosdep-${PV}.tar.gz" SRC_URI[md5sum] = "c1e3f200d9beddb5c70cc0a74ab47734" SRC_URI[sha256sum] = "6d043e1fb58d8b366f90b63ccfaff3140416bf1a6f4014bb3bb1b85af7a77073"