p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #308 from simkim/master 

roslaunch: Use as documented environment
This commit is contained in:
Lukas Bulwahn 2015-01-10 11:23:01 +01:00
parent e6c74f7537 ba3ff94092
commit f7ec055f63
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
recipes-ros/ros-comm/roslaunch/roscore-default
View File

@ -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

2
recipes-ros/ros-comm/roslaunch/roscore.service
View File

@ -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]