From ba3ff94092e7fee604382bbfd14ed639b44831bb Mon Sep 17 00:00:00 2001
From: Gauthier Monserand <simkim@simkim.net>
Date: Tue, 2 Dec 2014 23:16:43 +0100
Subject: [PATCH] roslaunch: Use as documented environment
roscore-default: Removing not supported variable in variable
roscore-default: Adding PATH, LD_LIBRARY_PATH and PYTHONPATH
roscore.service: Using /opt/ros/hydro/bin instead of /usr/bin to launch
roscore
You can now install roslaunch-systemd :
opkg install roslaunch-systemd
and start roscore :
systemctl start roscore
---
recipes-ros/ros-comm/roslaunch/roscore-default | 9 ++++++---
recipes-ros/ros-comm/roslaunch/roscore.service | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/recipes-ros/ros-comm/roslaunch/roscore-default b/recipes-ros/ros-comm/roslaunch/roscore-default
index 71df34e..094ad52 100644
--- a/recipes-ros/ros-comm/roslaunch/roscore-default
+++ b/recipes-ros/ros-comm/roslaunch/roscore-default
@@ -1,4 +1,7 @@
-ROS_ROOT=/usr
+ROS_ROOT=/opt/ros/hydro/
ROS_PORT=11311
-ROS_MASTER_URI=http://localhost:$ROS_PORT
-CMAKE_PREFIX_PATH=$ROS_ROOT
+ROS_MASTER_URI=http://localhost:11311
+CMAKE_PREFIX_PATH=/opt/ros/hydro/
+PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/ros/hydro/bin
+LD_LIBRARY_PATH=/opt/ros/hydro/lib
+PYTHONPATH=/opt/ros/hydro/lib/python2.7/site-packages
diff --git a/recipes-ros/ros-comm/roslaunch/roscore.service b/recipes-ros/ros-comm/roslaunch/roscore.service
index 47f6216..fd628d0 100644
--- a/recipes-ros/ros-comm/roslaunch/roscore.service
+++ b/recipes-ros/ros-comm/roslaunch/roscore.service
@@ -5,7 +5,7 @@ After=network.target
[Service]
EnvironmentFile=/etc/default/roscore
ExecStartPre=/bin/touch ${CMAKE_PREFIX_PATH}/.catkin
-ExecStart=/usr/bin/roscore -p $ROS_PORT
+ExecStart=/opt/ros/hydro/bin/roscore -p $ROS_PORT
Restart=on-abort
[Install]
--
GitLab