From 4fd8b658860f0f9db0a85c00d36a631e7e2ef6c5 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Mon, 26 Aug 2013 10:13:39 +0200
Subject: [PATCH] ros-comm: updating to 1.9.48
The ros-comm recipes are updated to 1.9.48 to be in line with
https://github.com/ros/rosdistro/blob/4551e7c32d1b34984410b79bc0ec36afe3d3d245/hydro/release.yaml.
The previously applied patches have been included in 1.9.48 and are
removed from the recipe and this repository.
---
...launch-check-script-in-install-space.patch | 25 --------
...h-rostest-paths-in-installspace-at-r.patch | 57 -------------------
...rs_1.9.47.bb => message-filters_1.9.48.bb} | 0
recipes-ros/ros-comm/ros-comm.inc | 7 +--
.../{rosbag_1.9.47.bb => rosbag_1.9.48.bb} | 0
...console_1.9.47.bb => rosconsole_1.9.48.bb} | 0
.../{roscpp_1.9.47.bb => roscpp_1.9.48.bb} | 0
...msgs_1.9.47.bb => rosgraph-msgs_1.9.48.bb} | 0
...{rosgraph_1.9.47.bb => rosgraph_1.9.48.bb} | 0
...oslaunch_1.9.47.bb => roslaunch_1.9.48.bb} | 0
...osmaster_1.9.47.bb => rosmaster_1.9.48.bb} | 0
.../{rosmsg_1.9.47.bb => rosmsg_1.9.48.bb} | 0
.../{rosnode_1.9.47.bb => rosnode_1.9.48.bb} | 0
.../{rosout_1.9.47.bb => rosout_1.9.48.bb} | 0
...{rosparam_1.9.47.bb => rosparam_1.9.48.bb} | 0
.../{rospy_1.9.47.bb => rospy_1.9.48.bb} | 0
...service_1.9.47.bb => rosservice_1.9.48.bb} | 0
.../{rostest_1.9.47.bb => rostest_1.9.48.bb} | 0
...{rostopic_1.9.47.bb => rostopic_1.9.48.bb} | 0
.../{roswtf_1.9.47.bb => roswtf_1.9.48.bb} | 0
...{std-srvs_1.9.47.bb => std-srvs_1.9.48.bb} | 0
...-tools_1.9.47.bb => topic-tools_1.9.48.bb} | 0
...{xmlrpcpp_1.9.47.bb => xmlrpcpp_1.9.48.bb} | 0
23 files changed, 2 insertions(+), 87 deletions(-)
delete mode 100644 recipes-ros/ros-comm/files/0001-fix-roslaunch-check-script-in-install-space.patch
delete mode 100644 recipes-ros/ros-comm/files/0002-resolve-roslaunch-rostest-paths-in-installspace-at-r.patch
rename recipes-ros/ros-comm/{message-filters_1.9.47.bb => message-filters_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosbag_1.9.47.bb => rosbag_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosconsole_1.9.47.bb => rosconsole_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{roscpp_1.9.47.bb => roscpp_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosgraph-msgs_1.9.47.bb => rosgraph-msgs_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosgraph_1.9.47.bb => rosgraph_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{roslaunch_1.9.47.bb => roslaunch_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosmaster_1.9.47.bb => rosmaster_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosmsg_1.9.47.bb => rosmsg_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosnode_1.9.47.bb => rosnode_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosout_1.9.47.bb => rosout_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosparam_1.9.47.bb => rosparam_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rospy_1.9.47.bb => rospy_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rosservice_1.9.47.bb => rosservice_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rostest_1.9.47.bb => rostest_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{rostopic_1.9.47.bb => rostopic_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{roswtf_1.9.47.bb => roswtf_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{std-srvs_1.9.47.bb => std-srvs_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{topic-tools_1.9.47.bb => topic-tools_1.9.48.bb} (100%)
rename recipes-ros/ros-comm/{xmlrpcpp_1.9.47.bb => xmlrpcpp_1.9.48.bb} (100%)
diff --git a/recipes-ros/ros-comm/files/0001-fix-roslaunch-check-script-in-install-space.patch b/recipes-ros/ros-comm/files/0001-fix-roslaunch-check-script-in-install-space.patch
deleted file mode 100644
index bda8dcc..0000000
--- a/recipes-ros/ros-comm/files/0001-fix-roslaunch-check-script-in-install-space.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 60f0f657bd9aabfedba0b00374ae8398e5e92359 Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dthomas@osrfoundation.org>
-Date: Wed, 24 Jul 2013 00:19:21 -0700
-Subject: [PATCH] fix roslaunch check script in install space (fix #257)
-
----
- tools/roslaunch/cmake/roslaunch-extras.cmake.em | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/roslaunch/cmake/roslaunch-extras.cmake.em b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
-index 10c0ce2..bb1ae40 100644
---- a/tools/roslaunch/cmake/roslaunch-extras.cmake.em
-+++ b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
-@@ -5,7 +5,7 @@
- set(roslaunch_check_script @(CMAKE_CURRENT_SOURCE_DIR)/scripts/roslaunch-check)
- @[else]@
- # set path to roslaunch-check.py installspace
--set(roslaunch_check_script @(CMAKE_INSTALL_PREFIX)/${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/roslaunch-check)
-+set(roslaunch_check_script @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)/scripts/roslaunch-check)
- @[end if]@
-
- #
---
-1.8.1.6
-
diff --git a/recipes-ros/ros-comm/files/0002-resolve-roslaunch-rostest-paths-in-installspace-at-r.patch b/recipes-ros/ros-comm/files/0002-resolve-roslaunch-rostest-paths-in-installspace-at-r.patch
deleted file mode 100644
index 794f3b2..0000000
--- a/recipes-ros/ros-comm/files/0002-resolve-roslaunch-rostest-paths-in-installspace-at-r.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e0366e14128ed0083e9450bbe9f98fd9b2806454 Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dthomas@osrfoundation.org>
-Date: Fri, 26 Jul 2013 13:37:23 -0700
-Subject: [PATCH] resolve roslaunch/rostest paths in installspace at runtime
- without find_program() (ros/catkin#490)
-
----
- tools/roslaunch/cmake/roslaunch-extras.cmake.em | 6 +++---
- tools/rostest/cmake/rostest-extras.cmake.em | 12 ++++--------
- 2 files changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/tools/roslaunch/cmake/roslaunch-extras.cmake.em b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
-index bb1ae40..6df3a14 100644
---- a/tools/roslaunch/cmake/roslaunch-extras.cmake.em
-+++ b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
-@@ -1,11 +1,11 @@
- # generated from ros_comm/tools/roslaunch/cmake/roslaunch-extras.cmake.em
-
- @[if DEVELSPACE]@
--# set path to roslaunch-check.py in develspace
-+# set path to roslaunch-check script in develspace
- set(roslaunch_check_script @(CMAKE_CURRENT_SOURCE_DIR)/scripts/roslaunch-check)
- @[else]@
--# set path to roslaunch-check.py installspace
--set(roslaunch_check_script @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)/scripts/roslaunch-check)
-+# set path to roslaunch-check script installspace
-+set(roslaunch_check_script ${roslaunch_DIR}/../scripts/roslaunch-check)
- @[end if]@
-
- #
-diff --git a/tools/rostest/cmake/rostest-extras.cmake.em b/tools/rostest/cmake/rostest-extras.cmake.em
-index 1fca6bc..93ca8ff 100644
---- a/tools/rostest/cmake/rostest-extras.cmake.em
-+++ b/tools/rostest/cmake/rostest-extras.cmake.em
-@@ -8,15 +8,11 @@ function(add_rostest file)
- _warn_if_skip_testing("add_rostest")
-
- @[if DEVELSPACE]@
-- # find program in develspace
-- find_program_required(ROSTEST_EXE rostest
-- PATHS @(PROJECT_SOURCE_DIR)/scripts
-- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+ # bin in develspace
-+ set(ROSTEST_EXE "@(PROJECT_SOURCE_DIR)/scripts/rostest")
- @[else]@
-- # find program in installspace
-- find_program_required(ROSTEST_EXE rostest
-- PATHS @(CMAKE_INSTALL_PREFIX)/bin
-- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+ # bin in installspace
-+ set(ROSTEST_EXE "${rostest_DIR}/../../../@(CATKIN_GLOBAL_BIN_DESTINATION)/rostest")
- @[end if]@
-
- cmake_parse_arguments(_rostest "" "WORKING_DIRECTORY" "ARGS" ${ARGN})
---
-1.8.1.6
-
diff --git a/recipes-ros/ros-comm/message-filters_1.9.47.bb b/recipes-ros/ros-comm/message-filters_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/message-filters_1.9.47.bb
rename to recipes-ros/ros-comm/message-filters_1.9.48.bb
diff --git a/recipes-ros/ros-comm/ros-comm.inc b/recipes-ros/ros-comm/ros-comm.inc
index 850bafd..3373ae5 100644
--- a/recipes-ros/ros-comm/ros-comm.inc
+++ b/recipes-ros/ros-comm/ros-comm.inc
@@ -1,9 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "2d4b8083abc6598857e01b698f4b0d20"
-SRC_URI[sha256sum] = "44c5a076a604134e44d044e08b2c15b185aefac277b8632b5ca2d011ec8d3da6"
-
-SRC_URI += "file://0001-fix-roslaunch-check-script-in-install-space.patch;patchdir=../.."
-SRC_URI += "file://0002-resolve-roslaunch-rostest-paths-in-installspace-at-r.patch;patchdir=../.."
+SRC_URI[md5sum] = "084abed026cfe1821b03cfcfc4cc4c17"
+SRC_URI[sha256sum] = "881f30e896c818502212762dda23bfd82ba384a4ec47d682f4f5fbe97b298cbc"
ROS_PKG_SUBDIR ?= ""
S = "${WORKDIR}/${ROS_SP}/${ROS_PKG_SUBDIR}/${ROS_BPN}"
diff --git a/recipes-ros/ros-comm/rosbag_1.9.47.bb b/recipes-ros/ros-comm/rosbag_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosbag_1.9.47.bb
rename to recipes-ros/ros-comm/rosbag_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosconsole_1.9.47.bb b/recipes-ros/ros-comm/rosconsole_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosconsole_1.9.47.bb
rename to recipes-ros/ros-comm/rosconsole_1.9.48.bb
diff --git a/recipes-ros/ros-comm/roscpp_1.9.47.bb b/recipes-ros/ros-comm/roscpp_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/roscpp_1.9.47.bb
rename to recipes-ros/ros-comm/roscpp_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosgraph-msgs_1.9.47.bb b/recipes-ros/ros-comm/rosgraph-msgs_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosgraph-msgs_1.9.47.bb
rename to recipes-ros/ros-comm/rosgraph-msgs_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosgraph_1.9.47.bb b/recipes-ros/ros-comm/rosgraph_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosgraph_1.9.47.bb
rename to recipes-ros/ros-comm/rosgraph_1.9.48.bb
diff --git a/recipes-ros/ros-comm/roslaunch_1.9.47.bb b/recipes-ros/ros-comm/roslaunch_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/roslaunch_1.9.47.bb
rename to recipes-ros/ros-comm/roslaunch_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosmaster_1.9.47.bb b/recipes-ros/ros-comm/rosmaster_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosmaster_1.9.47.bb
rename to recipes-ros/ros-comm/rosmaster_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosmsg_1.9.47.bb b/recipes-ros/ros-comm/rosmsg_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosmsg_1.9.47.bb
rename to recipes-ros/ros-comm/rosmsg_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosnode_1.9.47.bb b/recipes-ros/ros-comm/rosnode_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosnode_1.9.47.bb
rename to recipes-ros/ros-comm/rosnode_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosout_1.9.47.bb b/recipes-ros/ros-comm/rosout_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosout_1.9.47.bb
rename to recipes-ros/ros-comm/rosout_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosparam_1.9.47.bb b/recipes-ros/ros-comm/rosparam_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosparam_1.9.47.bb
rename to recipes-ros/ros-comm/rosparam_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rospy_1.9.47.bb b/recipes-ros/ros-comm/rospy_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rospy_1.9.47.bb
rename to recipes-ros/ros-comm/rospy_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rosservice_1.9.47.bb b/recipes-ros/ros-comm/rosservice_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rosservice_1.9.47.bb
rename to recipes-ros/ros-comm/rosservice_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rostest_1.9.47.bb b/recipes-ros/ros-comm/rostest_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rostest_1.9.47.bb
rename to recipes-ros/ros-comm/rostest_1.9.48.bb
diff --git a/recipes-ros/ros-comm/rostopic_1.9.47.bb b/recipes-ros/ros-comm/rostopic_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/rostopic_1.9.47.bb
rename to recipes-ros/ros-comm/rostopic_1.9.48.bb
diff --git a/recipes-ros/ros-comm/roswtf_1.9.47.bb b/recipes-ros/ros-comm/roswtf_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/roswtf_1.9.47.bb
rename to recipes-ros/ros-comm/roswtf_1.9.48.bb
diff --git a/recipes-ros/ros-comm/std-srvs_1.9.47.bb b/recipes-ros/ros-comm/std-srvs_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/std-srvs_1.9.47.bb
rename to recipes-ros/ros-comm/std-srvs_1.9.48.bb
diff --git a/recipes-ros/ros-comm/topic-tools_1.9.47.bb b/recipes-ros/ros-comm/topic-tools_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/topic-tools_1.9.47.bb
rename to recipes-ros/ros-comm/topic-tools_1.9.48.bb
diff --git a/recipes-ros/ros-comm/xmlrpcpp_1.9.47.bb b/recipes-ros/ros-comm/xmlrpcpp_1.9.48.bb
similarity index 100%
rename from recipes-ros/ros-comm/xmlrpcpp_1.9.47.bb
rename to recipes-ros/ros-comm/xmlrpcpp_1.9.48.bb
--
GitLab