From d142e71264f980ebf2589e04b1d37fa4d64dd4c7 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 9 Feb 2014 08:30:56 +0100
Subject: [PATCH] control-toolbox: updating to 1.10.4
The version 1.10.4 contains the local patch for
CATKIN_ENABLE_TESTING, and hence the local patch can be removed.
---
...osscompile-CATKIN_ENABLE_TESTING-fix.patch | 29 -------------------
...ox_1.10.3.bb => control-toolbox_1.10.4.bb} | 8 ++---
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 recipes-ros/control-toolbox/control-toolbox/0001-crosscompile-CATKIN_ENABLE_TESTING-fix.patch
rename recipes-ros/control-toolbox/{control-toolbox_1.10.3.bb => control-toolbox_1.10.4.bb} (57%)
diff --git a/recipes-ros/control-toolbox/control-toolbox/0001-crosscompile-CATKIN_ENABLE_TESTING-fix.patch b/recipes-ros/control-toolbox/control-toolbox/0001-crosscompile-CATKIN_ENABLE_TESTING-fix.patch
deleted file mode 100644
index 95b90e0..0000000
--- a/recipes-ros/control-toolbox/control-toolbox/0001-crosscompile-CATKIN_ENABLE_TESTING-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9de24db0b59a56dcb2ce0dc224a49315a6ada4c8 Mon Sep 17 00:00:00 2001
-From: vmayoral <v.mayoralv@gmail.com>
-Date: Thu, 8 Aug 2013 17:03:16 +0200
-Subject: [PATCH] crosscompile CATKIN_ENABLE_TESTING fix
-
----
- CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90f44e1..405c905 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,8 +87,10 @@ else()
- add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencpp) # wait for msgs
-
- # Tests
-- catkin_add_gtest(pid_tests test/pid_tests.cpp)
-- target_link_libraries(pid_tests ${catkin_LIBRARIES} ${PROJECT_NAME})
-+ if(CATKIN_ENABLE_TESTING)
-+ catkin_add_gtest(pid_tests test/pid_tests.cpp)
-+ target_link_libraries(pid_tests ${catkin_LIBRARIES} ${PROJECT_NAME})
-+ endif()
-
- # add_executable(test_linear test/linear.cpp)
-
---
-1.7.9.5
-
diff --git a/recipes-ros/control-toolbox/control-toolbox_1.10.3.bb b/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb
similarity index 57%
rename from recipes-ros/control-toolbox/control-toolbox_1.10.3.bb
rename to recipes-ros/control-toolbox/control-toolbox_1.10.4.bb
index 256f3ab..23e799a 100644
--- a/recipes-ros/control-toolbox/control-toolbox_1.10.3.bb
+++ b/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb
@@ -8,12 +8,8 @@ DEPENDS = "rosconsole tf roscpp angles message-generation \
dynamic-reconfigure libtinyxml realtime-tools message-filters"
SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "73ceaadbbcf2b8aa11aaaea7512bfeed"
-SRC_URI[sha256sum] = "cbdb189d12f0907e846f774d81e234ce61492ee9df386dde98948ef29c8e1974"
-
-SRC_URI += "file://0001-crosscompile-CATKIN_ENABLE_TESTING-fix.patch;striplevel=1;name=patch"
-SRC_URI[patch.md5sum] = "d6dcf1b9cd992658ebdd33f162540faa"
-SRC_URI[patch.sha256sum] = "90f388cac2832ff3fdb1bd162eadf01deb8ca062636d22c8507d8d43066827d6"
+SRC_URI[md5sum] = "28f8bc6536401456b207e20b4de2e8b3"
+SRC_URI[sha256sum] = "0fe2964d156f8bc1af89cca66007d46ef9c71cc2c4d34dfb0c7070c72b7141f6"
S = "${WORKDIR}/${ROS_SP}"
--
GitLab