diff --git a/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index 2d7346e..f8e59c3 100644 --- a/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/actionlib/actionlib/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 16:00:25 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +Upstream-Status: Backport [Accepted in indigo-devel branch] --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch b/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch index a69f576..07d7127 100644 --- a/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch +++ b/recipes-ros/catkin/catkin/0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch @@ -3,6 +3,8 @@ From: Stefan Herbrechtsmeier Date: Wed, 13 Mar 2013 11:49:17 +0100 Subject: [PATCH] CATKIN_WORKSPACES: Don't require .catkin file +Upstream-Status: Inappropriate [only for our setup] + Signed-off-by: Stefan Herbrechtsmeier --- cmake/all.cmake | 8 +++----- diff --git a/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch b/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch index 99b5cbf..5a57efc 100644 --- a/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch +++ b/recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Fix the path added to CMAKE_MODULE_PATH. @CMAKE_INSTALL_PREFIX@/@CATKIN_PACKAGE_SHARE_DESTINATION@ have been replaced with "${cmake_modules_DIR}/.." to make the module work. + +Upstream-Status: Pending --- cmake/cmake_modules-extras.cmake.installspace.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch index 1eb5f1c..e496bc4 100644 --- a/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ b/recipes-ros/depthimage-to-laserscan/depthimage-to-laserscan/0001-check-for-CATKIN_ENABLE_TESTING.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Wed, 22 Jan 2014 11:18:25 +0100 Subject: [PATCH] check for CATKIN_ENABLE_TESTING +Upstream-Status: Accepted --- CMakeLists.txt | 8 +++++--- package.xml | 2 +- diff --git a/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch index d3de21e..d1cd8ff 100644 --- a/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ b/recipes-ros/filters/filters/0001-check-for-CATKIN_ENABLE_TESTING.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Sat, 12 Oct 2013 11:39:36 +0200 Subject: [PATCH] check for CATKIN_ENABLE_TESTING +Upstream-Status: Accepted --- CMakeLists.txt | 64 +++++++++++++++++++++++++++++++--------------------------- package.xml | 2 +- diff --git a/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index 3674f22..7d46d06 100644 --- a/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/filters/filters/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 16:02:09 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +Upstream-Status: Accepted --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch index 73080d0..b0fbc07 100644 --- a/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ b/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Mon, 15 Jul 2013 14:04:43 +0200 Subject: [PATCH] check for CATKIN_ENABLE_TESTING +Upstream-Status: Accepted --- angles/CMakeLists.txt | 4 +++- angles/package.xml | 2 +- diff --git a/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index fac20da..3862a24 100644 --- a/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/geometry/tf/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 16:02:48 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +Upstream-Status: Backport [Accepted in indigo-devel branch] --- tf/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index 7b4b5aa..d3c12d1 100644 --- a/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 16:04:23 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +Upstream-Status: Accepted --- camera_info_manager/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index 4cdfc30..7adbd4a 100644 --- a/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/navigation/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 16:05:31 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +Upstream-Status: Submitted --- map_server/CMakeLists.txt | 2 +- robot_pose_ekf/CMakeLists.txt | 3 ++- diff --git a/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index ad9fcc9..45ab73d 100644 --- a/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/ros-comm/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,10 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 12:57:23 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +This patch includes the subsequent fix in the indigo-devel branch of the +ros_comm repository (commit "fix find_package() call with two package names"). + +Upstream-Status: Backport [Accepted in indigo-devel branch] --- tools/rosnode/CMakeLists.txt | 3 ++- tools/rostopic/CMakeLists.txt | 3 ++- @@ -62,7 +66,8 @@ index e441b9a..2d52451 100644 #Testing if(CATKIN_ENABLE_TESTING) -+ find_package(rostest rosunit) ++ find_package(rostest) ++ find_package(rosunit) catkin_add_gtest(${PROJECT_NAME}-utest test/utest.cpp) if(TARGET ${PROJECT_NAME}-utest) target_link_libraries(${PROJECT_NAME}-utest topic_tools) diff --git a/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch index a9a7438..ed7bad7 100644 --- a/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch +++ b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch @@ -6,6 +6,8 @@ Subject: Increase start and stop timeouts for ROS master. Certain boards are too slow to boot up the ROS master before roscore gives up. This patch increases the start and stop timeouts, giving the ROS master more time to start. + +Upstream-Status: Inappropriate [embedded specific] --- src/roslaunch/launch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index a3dda33..b2fb5ea 100644 --- a/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/ros-control/files/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 16:06:33 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +Upstream-Status: Submitted --- controller_manager_tests/CMakeLists.txt | 3 ++- joint_limits_interface/CMakeLists.txt | 3 ++- diff --git a/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch index 5f88b47..e960a88 100644 --- a/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ b/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Thu, 10 Apr 2014 07:31:32 +0200 Subject: [PATCH] check for CATKIN_ENABLE_TESTING +Upstream-Status: Submitted --- joint_trajectory_controller/CMakeLists.txt | 44 ++++++++++++++++-------------- joint_trajectory_controller/package.xml | 2 +- diff --git a/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch index 6b7f63c..2789f3d 100644 --- a/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ b/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Tue, 4 Feb 2014 16:07:10 +0100 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) +Upstream-Status: Submitted --- rospy_tutorials/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch index 891bbfc..de44af7 100644 --- a/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ b/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch @@ -3,6 +3,7 @@ From: Lukas Bulwahn Date: Sat, 12 Oct 2013 11:14:26 +0200 Subject: [PATCH] check for CATKIN_ENABLE_TESTING +Upstream-Status: Accepted --- CMakeLists.txt | 6 ++++-- package.xml | 2 +-