From 785eae0216dc8f4806506a463e9e222e6383a013 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 11 Jul 2013 16:56:13 +0200 Subject: [PATCH] ros: updated to hydro release version The rosunit patch required some minor adjustments. --- recipes-ros/ros/{mk_1.9.42.bb => mk_1.10.4.bb} | 0 recipes-ros/ros/ros.inc | 4 ++-- recipes-ros/ros/{rosbash_1.9.42.bb => rosbash_1.10.4.bb} | 0 .../ros/{rosboost-cfg_1.9.42.bb => rosboost-cfg_1.10.4.bb} | 0 recipes-ros/ros/{rosbuild_1.9.42.bb => rosbuild_1.10.4.bb} | 0 recipes-ros/ros/{rosclean_1.9.42.bb => rosclean_1.10.4.bb} | 0 recipes-ros/ros/{roscreate_1.9.42.bb => roscreate_1.10.4.bb} | 0 recipes-ros/ros/{roslang_1.9.42.bb => roslang_1.10.4.bb} | 0 recipes-ros/ros/{roslib_1.9.42.bb => roslib_1.10.4.bb} | 0 recipes-ros/ros/{rosmake_1.9.42.bb => rosmake_1.10.4.bb} | 0 ...rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch | 2 +- recipes-ros/ros/{rosunit_1.9.42.bb => rosunit_1.10.4.bb} | 0 12 files changed, 3 insertions(+), 3 deletions(-) rename recipes-ros/ros/{mk_1.9.42.bb => mk_1.10.4.bb} (100%) rename recipes-ros/ros/{rosbash_1.9.42.bb => rosbash_1.10.4.bb} (100%) rename recipes-ros/ros/{rosboost-cfg_1.9.42.bb => rosboost-cfg_1.10.4.bb} (100%) rename recipes-ros/ros/{rosbuild_1.9.42.bb => rosbuild_1.10.4.bb} (100%) rename recipes-ros/ros/{rosclean_1.9.42.bb => rosclean_1.10.4.bb} (100%) rename recipes-ros/ros/{roscreate_1.9.42.bb => roscreate_1.10.4.bb} (100%) rename recipes-ros/ros/{roslang_1.9.42.bb => roslang_1.10.4.bb} (100%) rename recipes-ros/ros/{roslib_1.9.42.bb => roslib_1.10.4.bb} (100%) rename recipes-ros/ros/{rosmake_1.9.42.bb => rosmake_1.10.4.bb} (100%) rename recipes-ros/ros/{rosunit_1.9.42.bb => rosunit_1.10.4.bb} (100%) diff --git a/recipes-ros/ros/mk_1.9.42.bb b/recipes-ros/ros/mk_1.10.4.bb similarity index 100% rename from recipes-ros/ros/mk_1.9.42.bb rename to recipes-ros/ros/mk_1.10.4.bb diff --git a/recipes-ros/ros/ros.inc b/recipes-ros/ros/ros.inc index ac46f06..5c421c5 100644 --- a/recipes-ros/ros/ros.inc +++ b/recipes-ros/ros/ros.inc @@ -1,5 +1,5 @@ SRC_URI = "https://github.com/ros/ros/archive/${PV}.tar.gz;downloadfilename=ros_${PV}.tar.gz" -SRC_URI[md5sum] = "e38f95785dc6dcbb8f8620c9298c2752" -SRC_URI[sha256sum] = "2d8997e1f6980c9cea85a27f39e17beb58db924283fc337c8df11fd79bcb3cb2" +SRC_URI[md5sum] = "26ad8652a18bc11b530b0054bbb204b3" +SRC_URI[sha256sum] = "ae3b8db6bf26867c38b1215e1e014616f00a396847fea31df64da63d2eac6ef2" inherit catkin diff --git a/recipes-ros/ros/rosbash_1.9.42.bb b/recipes-ros/ros/rosbash_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosbash_1.9.42.bb rename to recipes-ros/ros/rosbash_1.10.4.bb diff --git a/recipes-ros/ros/rosboost-cfg_1.9.42.bb b/recipes-ros/ros/rosboost-cfg_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosboost-cfg_1.9.42.bb rename to recipes-ros/ros/rosboost-cfg_1.10.4.bb diff --git a/recipes-ros/ros/rosbuild_1.9.42.bb b/recipes-ros/ros/rosbuild_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosbuild_1.9.42.bb rename to recipes-ros/ros/rosbuild_1.10.4.bb diff --git a/recipes-ros/ros/rosclean_1.9.42.bb b/recipes-ros/ros/rosclean_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosclean_1.9.42.bb rename to recipes-ros/ros/rosclean_1.10.4.bb diff --git a/recipes-ros/ros/roscreate_1.9.42.bb b/recipes-ros/ros/roscreate_1.10.4.bb similarity index 100% rename from recipes-ros/ros/roscreate_1.9.42.bb rename to recipes-ros/ros/roscreate_1.10.4.bb diff --git a/recipes-ros/ros/roslang_1.9.42.bb b/recipes-ros/ros/roslang_1.10.4.bb similarity index 100% rename from recipes-ros/ros/roslang_1.9.42.bb rename to recipes-ros/ros/roslang_1.10.4.bb diff --git a/recipes-ros/ros/roslib_1.9.42.bb b/recipes-ros/ros/roslib_1.10.4.bb similarity index 100% rename from recipes-ros/ros/roslib_1.9.42.bb rename to recipes-ros/ros/roslib_1.10.4.bb diff --git a/recipes-ros/ros/rosmake_1.9.42.bb b/recipes-ros/ros/rosmake_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosmake_1.9.42.bb rename to recipes-ros/ros/rosmake_1.10.4.bb diff --git a/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch b/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch index 176a072..1f5cd27 100644 --- a/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch +++ b/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch @@ -14,7 +14,7 @@ index 4b9bb0d..30db4d1 100644 @@ -14,7 +14,7 @@ macro(rosunit_initialize_tests) # find binary and scripts in installspace find_program(ROSUNIT_EXE rosunit - PATHS @(CMAKE_INSTALL_PREFIX)/bin + PATHS "@(CMAKE_INSTALL_PREFIX)/bin" - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) + NO_DEFAULT_PATH) if(NOT ROSUNIT_EXE) diff --git a/recipes-ros/ros/rosunit_1.9.42.bb b/recipes-ros/ros/rosunit_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosunit_1.9.42.bb rename to recipes-ros/ros/rosunit_1.10.4.bb