From c028899a33f7b3b4357cd0175efb6d90f60cf20d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 10 Apr 2018 09:33:31 +0000 Subject: [PATCH] roslaunch: refresh patch * fixes: WARNING: roslaunch-1.11.21-r1 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify devtool finish --force-patch-refresh Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch 0001-increase-rosmaster-timeout.patch patching file src/roslaunch/launch.py Hunk #1 succeeded at 59 with fuzz 2 (offset 4 lines). Now at patch 0001-increase-rosmaster-timeout.patch Signed-off-by: Martin Jansa --- .../0001-increase-rosmaster-timeout.patch | 22 +++++++++---------- recipes-ros/ros-comm/roslaunch_1.11.21.bb | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch index ed7bad7..affc791 100644 --- a/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch +++ b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch @@ -1,24 +1,25 @@ -From 3802a766efee8438c604b49507b15c17cf00982f Mon Sep 17 00:00:00 2001 +From 2455d52f41d886970d62f26e69849df29b3405b8 Mon Sep 17 00:00:00 2001 From: Esteve Fernandez Date: Tue, 14 Jan 2014 17:53:29 +0100 -Subject: Increase start and stop timeouts for ROS master. +Subject: [PATCH] Increase start and stop timeouts for ROS master. Certain boards are too slow to boot up the ROS master before roscore gives up. This patch increases the start and stop timeouts, giving the ROS master more time to start. Upstream-Status: Inappropriate [embedded specific] + --- - src/roslaunch/launch.py | 4 ++-- + tools/roslaunch/src/roslaunch/launch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/roslaunch/launch.py b/src/roslaunch/launch.py -index 1a2d3e4..a2d1fbd 100644 ---- a/src/roslaunch/launch.py -+++ b/src/roslaunch/launch.py -@@ -55,8 +55,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener +diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py +index 758d6fe..25b4053 100644 +--- a/tools/roslaunch/src/roslaunch/launch.py ++++ b/tools/roslaunch/src/roslaunch/launch.py +@@ -59,8 +59,8 @@ from roslaunch.rlutil import update_terminal_name - from roslaunch.rlutil import update_terminal_name + from rosmaster.master_api import NUM_WORKERS -_TIMEOUT_MASTER_START = 10.0 #seconds -_TIMEOUT_MASTER_STOP = 10.0 #seconds @@ -27,6 +28,3 @@ index 1a2d3e4..a2d1fbd 100644 _ID = '/roslaunch' --- -1.7.9.5 - diff --git a/recipes-ros/ros-comm/roslaunch_1.11.21.bb b/recipes-ros/ros-comm/roslaunch_1.11.21.bb index 6d2fd7e..2b49148 100644 --- a/recipes-ros/ros-comm/roslaunch_1.11.21.bb +++ b/recipes-ros/ros-comm/roslaunch_1.11.21.bb @@ -8,7 +8,7 @@ PR = "r1" require ros-comm.inc -SRC_URI += "file://0001-increase-rosmaster-timeout.patch \ +SRC_URI += "file://0001-increase-rosmaster-timeout.patch;patchdir=../.. \ file://roscore.service \ file://roscore-default \ "