From eceac35efba1db8708d2bd1ac719feb920143b22 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 19 May 2014 20:23:29 +0200 Subject: [PATCH] adding and updating Upstream-Status in patches --- .../0001-used-cmake_modules-to-find-TinyXML.patch | 2 ++ .../0001-check-for-CATKIN_ENABLE_TESTING.patch | 2 +- ...1-urdf-parser-py-install-scripts-use-catkin_python_set.patch | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-ros/ar-track-alvar/ar-track-alvar/0001-used-cmake_modules-to-find-TinyXML.patch b/recipes-ros/ar-track-alvar/ar-track-alvar/0001-used-cmake_modules-to-find-TinyXML.patch index 5cf7068..f3474e0 100644 --- a/recipes-ros/ar-track-alvar/ar-track-alvar/0001-used-cmake_modules-to-find-TinyXML.patch +++ b/recipes-ros/ar-track-alvar/ar-track-alvar/0001-used-cmake_modules-to-find-TinyXML.patch @@ -15,6 +15,8 @@ environment and the ROS layer for OpenEmbedded [2]. [1] https://github.com/ros/pluginlib/commit/2e0860ca42138f837b2e34921a207d40a095d996 [2] https://github.com/bmwcarit/meta-ros +Upstream-Status: Accepted + Signed-off-by: Lukas Bulwahn --- CMakeLists.txt | 10 ++++------ 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 e960a88..46d5001 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,7 +3,7 @@ From: Lukas Bulwahn Date: Thu, 10 Apr 2014 07:31:32 +0200 Subject: [PATCH] check for CATKIN_ENABLE_TESTING -Upstream-Status: Submitted +Upstream-Status: Accepted --- joint_trajectory_controller/CMakeLists.txt | 44 ++++++++++++++++-------------- joint_trajectory_controller/package.xml | 2 +- diff --git a/recipes-ros/urdfdom/urdfdom-py/0001-urdf-parser-py-install-scripts-use-catkin_python_set.patch b/recipes-ros/urdfdom/urdfdom-py/0001-urdf-parser-py-install-scripts-use-catkin_python_set.patch index 9597b35..c153612 100644 --- a/recipes-ros/urdfdom/urdfdom-py/0001-urdf-parser-py-install-scripts-use-catkin_python_set.patch +++ b/recipes-ros/urdfdom/urdfdom-py/0001-urdf-parser-py-install-scripts-use-catkin_python_set.patch @@ -15,6 +15,8 @@ The obtained files were slightly adjusted: - The version in the package.xml is fixed. - Paths in CMakeLists.txt and setup.py were changed for use with the bitbake recipe. + +Upstream-Status: Inappropriate [source repository shall work without catkin] --- urdf_parser_py/CMakeLists.txt | 16 ++++++++++------ urdf_parser_py/package.xml | 28 ++++++++++++++++++++++++++++