From fa6556f278afa29d553270f981a86f9b35da6bce Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 17 Nov 2014 14:59:02 +0100 Subject: [PATCH] ros-controllers: updating to 0.7.3 The patches in the meta-ros repository have been submitted and included in 0.7.3 and hence are deleted in this commit. --- ....7.2.bb => diff-drive-controller_0.7.3.bb} | 0 ...s_0.7.2.bb => effort-controllers_0.7.3.bb} | 0 ...> force-torque-sensor-controller_0.7.3.bb} | 0 ...bb => forward-command-controller_0.7.3.bb} | 0 ...ontroller-drop-unneeded-rostest-depe.patch | 38 -------- ....bb => gripper-action-controller_0.7.3.bb} | 2 - ....7.2.bb => imu-sensor-controller_0.7.3.bb} | 0 ...7.2.bb => joint-state-controller_0.7.3.bb} | 0 ...0001-check-for-CATKIN_ENABLE_TESTING.patch | 90 ------------------- ..._controller-make-rostest-in-CMakeLis.patch | 43 --------- ...b => joint-trajectory-controller_0.7.3.bb} | 3 - ...0.7.2.bb => position-controllers_0.7.3.bb} | 0 .../ros-controllers/ros-controllers.inc | 4 +- ...0.7.2.bb => velocity-controllers_0.7.3.bb} | 0 14 files changed, 2 insertions(+), 178 deletions(-) rename recipes-ros/ros-controllers/{diff-drive-controller_0.7.2.bb => diff-drive-controller_0.7.3.bb} (100%) rename recipes-ros/ros-controllers/{effort-controllers_0.7.2.bb => effort-controllers_0.7.3.bb} (100%) rename recipes-ros/ros-controllers/{force-torque-sensor-controller_0.7.2.bb => force-torque-sensor-controller_0.7.3.bb} (100%) rename recipes-ros/ros-controllers/{forward-command-controller_0.7.2.bb => forward-command-controller_0.7.3.bb} (100%) delete mode 100644 recipes-ros/ros-controllers/gripper-action-controller/0001-gripper_action_controller-drop-unneeded-rostest-depe.patch rename recipes-ros/ros-controllers/{gripper-action-controller_0.7.2.bb => gripper-action-controller_0.7.3.bb} (80%) rename recipes-ros/ros-controllers/{imu-sensor-controller_0.7.2.bb => imu-sensor-controller_0.7.3.bb} (100%) rename recipes-ros/ros-controllers/{joint-state-controller_0.7.2.bb => joint-state-controller_0.7.3.bb} (100%) delete mode 100644 recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch delete mode 100644 recipes-ros/ros-controllers/joint-trajectory-controller/0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch rename recipes-ros/ros-controllers/{joint-trajectory-controller_0.7.2.bb => joint-trajectory-controller_0.7.3.bb} (69%) rename recipes-ros/ros-controllers/{position-controllers_0.7.2.bb => position-controllers_0.7.3.bb} (100%) rename recipes-ros/ros-controllers/{velocity-controllers_0.7.2.bb => velocity-controllers_0.7.3.bb} (100%) diff --git a/recipes-ros/ros-controllers/diff-drive-controller_0.7.2.bb b/recipes-ros/ros-controllers/diff-drive-controller_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/diff-drive-controller_0.7.2.bb rename to recipes-ros/ros-controllers/diff-drive-controller_0.7.3.bb diff --git a/recipes-ros/ros-controllers/effort-controllers_0.7.2.bb b/recipes-ros/ros-controllers/effort-controllers_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/effort-controllers_0.7.2.bb rename to recipes-ros/ros-controllers/effort-controllers_0.7.3.bb diff --git a/recipes-ros/ros-controllers/force-torque-sensor-controller_0.7.2.bb b/recipes-ros/ros-controllers/force-torque-sensor-controller_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/force-torque-sensor-controller_0.7.2.bb rename to recipes-ros/ros-controllers/force-torque-sensor-controller_0.7.3.bb diff --git a/recipes-ros/ros-controllers/forward-command-controller_0.7.2.bb b/recipes-ros/ros-controllers/forward-command-controller_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/forward-command-controller_0.7.2.bb rename to recipes-ros/ros-controllers/forward-command-controller_0.7.3.bb diff --git a/recipes-ros/ros-controllers/gripper-action-controller/0001-gripper_action_controller-drop-unneeded-rostest-depe.patch b/recipes-ros/ros-controllers/gripper-action-controller/0001-gripper_action_controller-drop-unneeded-rostest-depe.patch deleted file mode 100644 index ac2ec8a..0000000 --- a/recipes-ros/ros-controllers/gripper-action-controller/0001-gripper_action_controller-drop-unneeded-rostest-depe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 79856f596b827981fb5dad854c56347b912836fd Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Thu, 31 Jul 2014 21:06:41 +0200 -Subject: [PATCH] gripper_action_controller: drop unneeded rostest dependency - -Upstream-Status: Accepted ---- - gripper_action_controller/CMakeLists.txt | 1 - - gripper_action_controller/package.xml | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/gripper_action_controller/CMakeLists.txt b/gripper_action_controller/CMakeLists.txt -index 555ec69..2b925a9 100644 ---- a/gripper_action_controller/CMakeLists.txt -+++ b/gripper_action_controller/CMakeLists.txt -@@ -17,7 +17,6 @@ find_package(catkin - realtime_tools - control_msgs - trajectory_msgs -- rostest - controller_manager - xacro - ) -diff --git a/gripper_action_controller/package.xml b/gripper_action_controller/package.xml -index 513321b..2607005 100644 ---- a/gripper_action_controller/package.xml -+++ b/gripper_action_controller/package.xml -@@ -49,7 +49,6 @@ - controller_manager - hardware_interface - realtime_tools -- rostest - trajectory_msgs - urdf - xacro --- -1.7.9.5 - diff --git a/recipes-ros/ros-controllers/gripper-action-controller_0.7.2.bb b/recipes-ros/ros-controllers/gripper-action-controller_0.7.3.bb similarity index 80% rename from recipes-ros/ros-controllers/gripper-action-controller_0.7.2.bb rename to recipes-ros/ros-controllers/gripper-action-controller_0.7.3.bb index f9bbc39..365872b 100644 --- a/recipes-ros/ros-controllers/gripper-action-controller_0.7.2.bb +++ b/recipes-ros/ros-controllers/gripper-action-controller_0.7.3.bb @@ -7,5 +7,3 @@ DEPENDS = "actionlib angles cmake-modules roscpp urdf control-toolbox controller hardware-interface realtime-tools control-msgs trajectory-msgs controller-manager xacro" require ros-controllers.inc - -SRC_URI += "file://0001-gripper_action_controller-drop-unneeded-rostest-depe.patch;striplevel=2" diff --git a/recipes-ros/ros-controllers/imu-sensor-controller_0.7.2.bb b/recipes-ros/ros-controllers/imu-sensor-controller_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/imu-sensor-controller_0.7.2.bb rename to recipes-ros/ros-controllers/imu-sensor-controller_0.7.3.bb diff --git a/recipes-ros/ros-controllers/joint-state-controller_0.7.2.bb b/recipes-ros/ros-controllers/joint-state-controller_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/joint-state-controller_0.7.2.bb rename to recipes-ros/ros-controllers/joint-state-controller_0.7.3.bb 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 deleted file mode 100644 index 46d5001..0000000 --- a/recipes-ros/ros-controllers/joint-trajectory-controller/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 9729165a4725b2a70d6c8d3690da76213bc8b5ec Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Thu, 10 Apr 2014 07:31:32 +0200 -Subject: [PATCH] check for CATKIN_ENABLE_TESTING - -Upstream-Status: Accepted ---- - joint_trajectory_controller/CMakeLists.txt | 44 ++++++++++++++++-------------- - joint_trajectory_controller/package.xml | 2 +- - 2 files changed, 24 insertions(+), 22 deletions(-) - -diff --git a/joint_trajectory_controller/CMakeLists.txt b/joint_trajectory_controller/CMakeLists.txt -index a1a3c4d..afc792d 100644 ---- a/joint_trajectory_controller/CMakeLists.txt -+++ b/joint_trajectory_controller/CMakeLists.txt -@@ -102,35 +102,37 @@ else() - LIBRARIES ${PROJECT_NAME} - ) - -- catkin_add_gtest(quintic_spline_segment_test test/quintic_spline_segment_test.cpp) -- target_link_libraries(quintic_spline_segment_test ${catkin_LIBRARIES}) -+ if(CATKIN_ENABLE_TESTING) -+ catkin_add_gtest(quintic_spline_segment_test test/quintic_spline_segment_test.cpp) -+ target_link_libraries(quintic_spline_segment_test ${catkin_LIBRARIES}) - -- catkin_add_gtest(trajectory_interface_test test/trajectory_interface_test.cpp) -- target_link_libraries(trajectory_interface_test ${catkin_LIBRARIES}) -+ catkin_add_gtest(trajectory_interface_test test/trajectory_interface_test.cpp) -+ target_link_libraries(trajectory_interface_test ${catkin_LIBRARIES}) - -- catkin_add_gtest(joint_trajectory_segment_test test/joint_trajectory_segment_test.cpp) -- target_link_libraries(joint_trajectory_segment_test ${catkin_LIBRARIES}) -+ catkin_add_gtest(joint_trajectory_segment_test test/joint_trajectory_segment_test.cpp) -+ target_link_libraries(joint_trajectory_segment_test ${catkin_LIBRARIES}) - -- catkin_add_gtest(joint_trajectory_msg_utils_test test/joint_trajectory_msg_utils_test.cpp) -- target_link_libraries(joint_trajectory_msg_utils_test ${catkin_LIBRARIES}) -+ catkin_add_gtest(joint_trajectory_msg_utils_test test/joint_trajectory_msg_utils_test.cpp) -+ target_link_libraries(joint_trajectory_msg_utils_test ${catkin_LIBRARIES}) - -- catkin_add_gtest(init_joint_trajectory_test test/init_joint_trajectory_test.cpp) -- target_link_libraries(init_joint_trajectory_test ${catkin_LIBRARIES}) -+ catkin_add_gtest(init_joint_trajectory_test test/init_joint_trajectory_test.cpp) -+ target_link_libraries(init_joint_trajectory_test ${catkin_LIBRARIES}) - -- add_rostest_gtest(tolerances_test -- test/tolerances.test -- test/tolerances_test.cpp) -- target_link_libraries(tolerances_test ${catkin_LIBRARIES}) -+ add_rostest_gtest(tolerances_test -+ test/tolerances.test -+ test/tolerances_test.cpp) -+ target_link_libraries(tolerances_test ${catkin_LIBRARIES}) - -- add_executable(rrbot test/rrbot.cpp) -- target_link_libraries(rrbot ${catkin_LIBRARIES}) -+ add_executable(rrbot test/rrbot.cpp) -+ target_link_libraries(rrbot ${catkin_LIBRARIES}) - -- add_dependencies(tests rrbot) -+ add_dependencies(tests rrbot) - -- add_rostest_gtest(joint_trajectory_controller_test -- test/joint_trajectory_controller.test -- test/joint_trajectory_controller_test.cpp) -- target_link_libraries(joint_trajectory_controller_test ${catkin_LIBRARIES}) -+ add_rostest_gtest(joint_trajectory_controller_test -+ test/joint_trajectory_controller.test -+ test/joint_trajectory_controller_test.cpp) -+ target_link_libraries(joint_trajectory_controller_test ${catkin_LIBRARIES}) -+ endif() - - # Install - install(DIRECTORY include/${PROJECT_NAME}/ -diff --git a/joint_trajectory_controller/package.xml b/joint_trajectory_controller/package.xml -index bc2ab39..54ba444 100644 ---- a/joint_trajectory_controller/package.xml -+++ b/joint_trajectory_controller/package.xml -@@ -13,7 +13,7 @@ - - Adolfo Rodriguez Tsouroukdissian - -- catkin -+ catkin - - cmake_modules - actionlib --- -1.8.3.2 - diff --git a/recipes-ros/ros-controllers/joint-trajectory-controller/0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch b/recipes-ros/ros-controllers/joint-trajectory-controller/0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch deleted file mode 100644 index 614f52f..0000000 --- a/recipes-ros/ros-controllers/joint-trajectory-controller/0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f87e0c5c30bf99e0a45cfef7a8dc17a60ac41cba Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Thu, 31 Jul 2014 21:18:31 +0200 -Subject: [PATCH] joint_trajectory_controller: make rostest in CMakeLists - optional (ros/rosdistro#3010) - -Upstream-Status: Accepted ---- - joint_trajectory_controller/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/joint_trajectory_controller/CMakeLists.txt b/joint_trajectory_controller/CMakeLists.txt -index 06e9d93..9687ec3 100644 ---- a/joint_trajectory_controller/CMakeLists.txt -+++ b/joint_trajectory_controller/CMakeLists.txt -@@ -61,7 +61,6 @@ else() - realtime_tools - control_msgs - trajectory_msgs -- rostest - controller_manager - xacro - ) -@@ -79,7 +78,6 @@ else() - realtime_tools - control_msgs - trajectory_msgs -- rostest - controller_manager - xacro - INCLUDE_DIRS include -@@ -103,6 +101,8 @@ else() - target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}) - - if(CATKIN_ENABLE_TESTING) -+ find_package(rostest) -+ - catkin_add_gtest(quintic_spline_segment_test test/quintic_spline_segment_test.cpp) - target_link_libraries(quintic_spline_segment_test ${catkin_LIBRARIES}) - --- -1.7.9.5 - diff --git a/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.2.bb b/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.3.bb similarity index 69% rename from recipes-ros/ros-controllers/joint-trajectory-controller_0.7.2.bb rename to recipes-ros/ros-controllers/joint-trajectory-controller_0.7.3.bb index dce69ef..62b513b 100644 --- a/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.2.bb +++ b/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.3.bb @@ -6,6 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc DEPENDS = "actionlib angles cmake-modules control-toolbox controller-interface controller-manager control-msgs urdf xacro" require ros-controllers.inc - -SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2 \ - file://0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch;striplevel=2" diff --git a/recipes-ros/ros-controllers/position-controllers_0.7.2.bb b/recipes-ros/ros-controllers/position-controllers_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/position-controllers_0.7.2.bb rename to recipes-ros/ros-controllers/position-controllers_0.7.3.bb diff --git a/recipes-ros/ros-controllers/ros-controllers.inc b/recipes-ros/ros-controllers/ros-controllers.inc index dc61ebb..300c4c7 100644 --- a/recipes-ros/ros-controllers/ros-controllers.inc +++ b/recipes-ros/ros-controllers/ros-controllers.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "bffda0ae65f2813a9ef908ec4f3ec26b" -SRC_URI[sha256sum] = "fdf498d4e1acd9e0cb7c00abe201af993bbbf82e83ca4c5c9fc9a0ac73a62f91" +SRC_URI[md5sum] = "bc1fefe5b293d95e1491e04594907b72" +SRC_URI[sha256sum] = "407368e9bc7058b4baff400219613d157547c19394a3b139662d789c3a846feb" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/ros-controllers/velocity-controllers_0.7.2.bb b/recipes-ros/ros-controllers/velocity-controllers_0.7.3.bb similarity index 100% rename from recipes-ros/ros-controllers/velocity-controllers_0.7.2.bb rename to recipes-ros/ros-controllers/velocity-controllers_0.7.3.bb