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

properly updating to ROS indigo

This commit is contained in:
Lukas Bulwahn 2015-05-20 20:22:23 +02:00
parent 0dde648109
commit 0a2747aedb
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -7,7 +7,7 @@ Currently, this layer is still under continuous development.
* Source Code Repository: https://github.com/bmwcarit/meta-ros.git * Source Code Repository: https://github.com/bmwcarit/meta-ros.git
* Issue Tracker: https://github.com/bmwcarit/meta-ros/issues * Issue Tracker: https://github.com/bmwcarit/meta-ros/issues
* Mailing List: https://groups.google.com/forum/#!forum/meta-ros * Mailing List: https://groups.google.com/forum/#!forum/meta-ros
* Installation Guide: http://wiki.ros.org/hydro/Installation/OpenEmbedded * Installation Guide: http://wiki.ros.org/indigo/Installation/OpenEmbedded
* Development Guides: * Development Guides:
* https://github.com/bmwcarit/meta-ros/wiki/Guidelines-for-ROS-recipes * https://github.com/bmwcarit/meta-ros/wiki/Guidelines-for-ROS-recipes
* https://github.com/bmwcarit/meta-ros/wiki/Developer-Guidelines * https://github.com/bmwcarit/meta-ros/wiki/Developer-Guidelines
@ -153,13 +153,13 @@ Currently, this layer is still under continuous development.
to the /etc/hosts file, and set up the environment with to the /etc/hosts file, and set up the environment with
export ROS_ROOT=/opt/ros/hydro export ROS_ROOT=/opt/ros/indigo
export PATH=$PATH:/opt/ros/hydro/bin export PATH=$PATH:/opt/ros/indigo/bin
export LD_LIBRARY_PATH=/opt/ros/hydro/lib export LD_LIBRARY_PATH=/opt/ros/indigo/lib
export PYTHONPATH=/opt/ros/hydro/lib/python2.7/site-packages export PYTHONPATH=/opt/ros/indigo/lib/python2.7/site-packages
export ROS_MASTER_URI=http://localhost:11311 export ROS_MASTER_URI=http://localhost:11311
export CMAKE_PREFIX_PATH=/opt/ros/hydro export CMAKE_PREFIX_PATH=/opt/ros/indigo
touch /opt/ros/hydro/.catkin touch /opt/ros/indigo/.catkin
Finally, you can start roscore with Finally, you can start roscore with

2
conf/layer.conf
View File

@ -10,4 +10,4 @@ BBFILE_PRIORITY_ros-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses" LICENSE_PATH += "${LAYERDIR}/licenses"
ROSDISTRO := "hydro" ROSDISTRO := "indigo"

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

@ -1,7 +1,7 @@
ROS_ROOT=/opt/ros/hydro/ ROS_ROOT=/opt/ros/indigo/
ROS_PORT=11311 ROS_PORT=11311
ROS_MASTER_URI=http://localhost:11311 ROS_MASTER_URI=http://localhost:11311
CMAKE_PREFIX_PATH=/opt/ros/hydro/ CMAKE_PREFIX_PATH=/opt/ros/indigo/
PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/ros/hydro/bin PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/ros/indigo/bin
LD_LIBRARY_PATH=/opt/ros/hydro/lib LD_LIBRARY_PATH=/opt/ros/indigo/lib
PYTHONPATH=/opt/ros/hydro/lib/python2.7/site-packages PYTHONPATH=/opt/ros/indigo/lib/python2.7/site-packages

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

@ -5,7 +5,7 @@ After=network.target
[Service] [Service]
EnvironmentFile=/etc/default/roscore EnvironmentFile=/etc/default/roscore
ExecStartPre=/bin/touch ${CMAKE_PREFIX_PATH}/.catkin ExecStartPre=/bin/touch ${CMAKE_PREFIX_PATH}/.catkin
ExecStart=/opt/ros/hydro/bin/roscore -p $ROS_PORT ExecStart=/opt/ros/indigo/bin/roscore -p $ROS_PORT
Restart=on-abort Restart=on-abort
[Install] [Install]