p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
meta-ros/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-tim...

31 lines
1.0 KiB
Diff
Raw Normal View History

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 <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> 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 <Martin.Jansa@gmail.com>
2018-04-10 17:33:31 +08:00
From 2455d52f41d886970d62f26e69849df29b3405b8 Mon Sep 17 00:00:00 2001
roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)
2014-01-15 01:07:40 +08:00
From: Esteve Fernandez <esteve@osrfoundation.org>
Date: Tue, 14 Jan 2014 17:53:29 +0100
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 <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> 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 <Martin.Jansa@gmail.com>
2018-04-10 17:33:31 +08:00
Subject: [PATCH] Increase start and stop timeouts for ROS master.
roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)
2014-01-15 01:07:40 +08:00
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.
adding Upstream-Status remarks to patches in recipes-ros This commit further adds a simple fix to the patch for the ros-comm repository.
2014-01-23 14:43:03 +08:00
Upstream-Status: Inappropriate [embedded specific]
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 <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> 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 <Martin.Jansa@gmail.com>
2018-04-10 17:33:31 +08:00
roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)
2014-01-15 01:07:40 +08:00
---
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 <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> 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 <Martin.Jansa@gmail.com>
2018-04-10 17:33:31 +08:00
tools/roslaunch/src/roslaunch/launch.py | 4 ++--
roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)
2014-01-15 01:07:40 +08:00
1 file changed, 2 insertions(+), 2 deletions(-)
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 <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> 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 <Martin.Jansa@gmail.com>
2018-04-10 17:33:31 +08:00
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
roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)
2014-01-15 01:07:40 +08:00
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 <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> 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 <Martin.Jansa@gmail.com>
2018-04-10 17:33:31 +08:00
from rosmaster.master_api import NUM_WORKERS
roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)
2014-01-15 01:07:40 +08:00
-_TIMEOUT_MASTER_START = 10.0 #seconds
-_TIMEOUT_MASTER_STOP = 10.0 #seconds
+_TIMEOUT_MASTER_START = 60.0 #seconds
+_TIMEOUT_MASTER_STOP = 60.0 #seconds
_ID = '/roslaunch'