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

simplified groovy installation on target

This commit is contained in:
Lukas Bulwahn 2013-01-11 10:41:30 +01:00
parent e7a336b151
commit 2c8274b74f
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
install-groovy.sh
View File

@ -14,28 +14,7 @@ SRC_DIRECTORY="/home/lukas/ros_catkin_ws"
scp $USERNAME@$HOST_IP:$SRC_DIRECTORY/src.tar.gz .
mkdir ros_catkin_ws
cd ros_catkin_ws
# extract
tar -xzf ../src.tar.gz
# patch catkin
patch -p1 << EOF
*** A/src/catkin/cmake/python.cmake 2013-01-04 14:22:33.223884756 +0100
--- B/src/catkin/cmake/python.cmake 2013-01-04 14:28:01.971898385 +0100
***************
*** 6,12 ****
set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY} CACHE STRING "Python version")
#This should be resolved automatically one day...
! option(SETUPTOOLS_DEB_LAYOUT "ON for debian style python packages layout" ON)
if(APPLE OR MSVC)
set(SETUPTOOLS_DEB_LAYOUT OFF)
--- 6,12 ----
set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY} CACHE STRING "Python version")
#This should be resolved automatically one day...
! option(SETUPTOOLS_DEB_LAYOUT "ON for debian style python packages layout" OFF)
if(APPLE OR MSVC)
set(SETUPTOOLS_DEB_LAYOUT OFF)
EOF
# run catkin
./src/catkin/bin/catkin_make_isolated --install
# compile, make and install
catkin_make_isolated --install

4
recipes-core/images/core-image-ros-groovy.bb
View File

@ -28,4 +28,6 @@ IMAGE_INSTALL += "packagegroup-core-ssh-openssh cmake \
python-modules python-misc python-empy python-setuptools \
boost boost-dev python-dev libtinyxml libtinyxml-dev \
log4cxx log4cxx-dev libbz2-dev \
python-argparse python-rosdep python-wstool"
python-argparse python-rosdep python-wstool \
catkin \
"