From 67a46daab9870fed43a543a53e5ceef32d8172ec Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve@osrfoundation.org>
Date: Tue, 14 Jan 2014 18:07:40 +0100
Subject: [PATCH] roslaunch: increase the start and stop timeouts for the ROS
 master (resolves #215)

---
 .../0001-increase-rosmaster-timeout.patch     | 30 +++++++++++++++++++
 recipes-ros/ros-comm/roslaunch_1.9.50.bb      |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch

diff --git a/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch
new file mode 100644
index 0000000..a9a7438
--- /dev/null
+++ b/recipes-ros/ros-comm/roslaunch/0001-increase-rosmaster-timeout.patch
@@ -0,0 +1,30 @@
+From 3802a766efee8438c604b49507b15c17cf00982f Mon Sep 17 00:00:00 2001
+From: Esteve Fernandez <esteve@osrfoundation.org>
+Date: Tue, 14 Jan 2014 17:53:29 +0100
+Subject: 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.
+---
+ 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
+ 
+ from roslaunch.rlutil import update_terminal_name
+ 
+-_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'
+ 
+-- 
+1.7.9.5
+
diff --git a/recipes-ros/ros-comm/roslaunch_1.9.50.bb b/recipes-ros/ros-comm/roslaunch_1.9.50.bb
index 927a035..6776f9f 100644
--- a/recipes-ros/ros-comm/roslaunch_1.9.50.bb
+++ b/recipes-ros/ros-comm/roslaunch_1.9.50.bb
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9de
 
 require ros-comm.inc
 
+SRC_URI += "file://0001-increase-rosmaster-timeout.patch"
+
 ROS_PKG_SUBDIR = "tools"
 
 RDEPENDS_${PN} = "\