From 4f99b152f1602b97eb53cf994735a1b123c6319c Mon Sep 17 00:00:00 2001
From: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Date: Wed, 14 Aug 2013 14:17:37 +0200
Subject: [PATCH] dynamic-reconfigure: Include patch in our repository
(resolves #146)
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
---
...reconfigure-path-in-installspace-at-.patch | 26 +++++++++++++++++++
.../dynamic-reconfigure_1.5.32.bb | 4 +--
2 files changed, 27 insertions(+), 3 deletions(-)
create mode 100644 recipes-ros/dynamic-reconfigure/dynamic-reconfigure/0001-resolve-dynamic_reconfigure-path-in-installspace-at-.patch
diff --git a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure/0001-resolve-dynamic_reconfigure-path-in-installspace-at-.patch b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure/0001-resolve-dynamic_reconfigure-path-in-installspace-at-.patch
new file mode 100644
index 0000000..175480e
--- /dev/null
+++ b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure/0001-resolve-dynamic_reconfigure-path-in-installspace-at-.patch
@@ -0,0 +1,26 @@
+From b7b222534f7259ca457ea354d92c5708f895202e Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dthomas@osrfoundation.org>
+Date: Mon, 29 Jul 2013 11:51:23 -0700
+Subject: [PATCH] resolve dynamic_reconfigure path in installspace at runtime
+ (ros/catkin#490)
+
+---
+ cmake/extras.cmake.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/extras.cmake.em b/cmake/extras.cmake.em
+index de2082e..e37b1fa 100644
+--- a/cmake/extras.cmake.em
++++ b/cmake/extras.cmake.em
+@@ -3,7 +3,7 @@
+ set(dynamic_reconfigure_BASE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)")
+ @[else]@
+ # base dir in installspace
+-set(dynamic_reconfigure_BASE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)")
++set(dynamic_reconfigure_BASE_DIR "${dynamic_reconfigure_DIR}/..")
+ @[end if]@
+
+ macro(generate_dynamic_reconfigure_options)
+--
+1.8.1.6
+
diff --git a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb
index ea4dcc3..ec96a62 100644
--- a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb
+++ b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb
@@ -9,9 +9,7 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena
SRC_URI[md5sum] = "9061fd30e5a04e8376eaddffaae86b07"
SRC_URI[sha256sum] = "4203b0a8389d9ac3203110b507d23fa353262cf26253f40abece6418d6c2bdd4"
-SRC_URI += "https://github.com/ros/${ROS_SPN}/commit/b7b222534f7259ca457ea354d92c5708f895202e.patch;name=patch"
-SRC_URI[patch.md5sum] = "0607963ca3f940362c9e78b5f8019cb9"
-SRC_URI[patch.sha256sum] = "e132ed52fe35c287658700857f7d9439793ff2be7f9fa9a19731024152ccaf29"
+SRC_URI += "file://0001-resolve-dynamic_reconfigure-path-in-installspace-at-.patch"
DEPENDS = "roscpp std-msgs roslib"
--
GitLab