Merge pull request #44 from bulwahn/master

clean-up and some new recipes

README

@@ -29,7 +29,6 @@ STATE OF THIS WORK:
   This repository provides
   - Native compilation of ROS-fuerte
   - Native compilation of ROS-groovy
-  - Attempt of cross-compilation of ROS-fuerte (discontinued)
   - Cross-compilation of catkin 0.5.58 (shipped with ROS-groovy)
   - catkin 0.5.58 setup for cross-compiling catkin packages
   - Attempt of cross-compilation of ROS-groovy (in development)
@@ -89,30 +88,6 @@ USE for native compilation of ROS-groovy on the qemu VM:
   The installation script installs ros and starts roscore.
 
 
-USE for cross-compilation of ROS-fuerte (discontinued):
-   
-  source oe-init-build-env
-  bitbake ros
-
-  momentarily fails at some point with:
-
-> CMake Error at catkin/cmake/find_program_required.cmake:5 (message):
->  check_test_ran.py not found
-> Call Stack (most recent call first):
->  ../catkin/CMakeFiles/tests.cmake:31 (find_program_required)
->  ../catkin/CMakeFiles/tests.cmake:41 (catkin_initialize_tests)
->  catkin/cmake/all.cmake:54 (include)
->  catkin/CMakeLists.txt:12 (include)
->
->
->
-> -- Configuring incomplete, errors occurred!
->
->
-> ERROR: Function failed: do_configure (see /home/lukas/NEW/poky-danny-8.0/build/tmp/work/i586-poky-linux/ros-1.0-r0/temp/log.do_configure.9702 for further information)
-> ERROR: Logfile of failure stored in: /home/lukas/NEW/poky-danny-8.0/build/tmp/work/i586-poky-linux/ros-1.0-r0/temp/log.do_configure.9702
-
-
 USE for cross-compilation of ROS-groovy (in development):
 
   Currently, we can cross-compile 4 packages:

install-groovy.sh

@@ -16,8 +16,31 @@ 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
 # compile, make and install
-catkin_make_isolated --install
+./src/catkin/bin/catkin_make_isolated --install
 # start roscore
 . install_isolated/setup.sh
 roscore
+

mk_srcarchive.sh

@@ -1,8 +1,5 @@
 wget -O ros_comm http://packages.ros.org/web/rosinstall/generate/raw/groovy/ros_comm
 mkdir -p archives
-grep -e "- tar: {local-name: .*, uri: '.*'," ros_comm | \
-grep -v "catkin" | grep -v "cpp_common" | grep -v "rostime" | grep -v "roscpp_serialization" | grep -v "roscpp_traits" | \
-sed "s#- tar: {local-name: \(.*\), uri: '\(.*\)',#wget -O archives/\1.tar.gz \2 \&\& mkdir -p src/\1 \&\& tar --strip-components=1 -xzf archives/\1.tar.gz -C src/\1/ #" | sh
+grep -e "- tar: {local-name: .*, uri: '.*'," ros_comm | sed "s#- tar: {local-name: \(.*\), uri: '\(.*\)',#wget -O archives/\1.tar.gz \2 \&\& mkdir -p src/\1 \&\& tar --strip-components=1 -xzf archives/\1.tar.gz -C src/\1/ #" | sh
 tar -czf src.tar.gz src
 
-

recipes-core/images/core-image-ros-groovy.bb

@@ -29,6 +29,5 @@ IMAGE_INSTALL += "packagegroup-core-ssh-openssh cmake \
   boost boost-dev python-dev libtinyxml libtinyxml-dev \
   log4cxx log4cxx-dev libbz2-dev \
   python-argparse python-rosdep python-wstool \
-  catkin \
-  roscpp-core \
-  "
+"
+

recipes-devtools/python/python-nose_1.2.1.bb

@@ -1,6 +1,6 @@
 DESCRIPTION = "nose extends unittest to make testing easier"
 SECTION = "devel/python"
-LICENSE = "GNU LPGL"
+LICENSE = "LPGL-2.1"
 LIC_FILES_CHKSUM = "file://lgpl.txt;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 SRCNAME = "nose"

recipes-devtools/python/python-rosinstall_0.6.21.bb

@@ -12,6 +12,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 # install_requires=['vcstools', 'pyyaml'],
 DEPENDS += "python-vcstools python-pyyaml"
+RDEPENDS_${PN} = "python-vcstools"
 
 inherit setuptools
 

recipes-ros/ros/mk_1.9.42.bb

@@ -0,0 +1,10 @@
+DESCRIPTION = "A collection of .mk include files for building ROS architectural elements."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = ""
+
+require ros.inc
+
+S = "${WORKDIR}/ros-${PV}/core/${BPN}"

recipes-ros/ros/ros.bb

@@ -1,27 +0,0 @@
-DESCRIPTION  = "ROS"
-HOMEPAGE = "http://ros.org"
-
-LICENSE = "CLOSED"
-# LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
-
-DEPENDS = "python-empy-native python-rospkg-native python-native python-pyyaml-native python-nose-native eglibc"
-
-PR = "r0"
-
-SRC_URI = "file://fuerte-ros-base.rosinstall"
-
-S = "${WORKDIR}"
-
-OECMAKE_SOURCEPATH = "${WORKDIR}/ros-underlay"
-EXTRA_OECMAKE = "-DSETUPTOOLS_DEB_LAYOUT=OFF"
-
-inherit pythonnative cmake
-
-do_rosinstall () {
-	echo "Installing ros"
-        mkdir -p ./ros-underlay
-	rosinstall --catkin ./ros-underlay fuerte-ros-base.rosinstall
-}
-addtask rosinstall after do_patch before do_configure
-
-

recipes-ros/ros/ros/fuerte-ros-base.rosinstall

@@ -1,44 +0,0 @@
-- git:
-    local-name: catkin
-    uri: git://github.com/wg-debs/catkin-release.git
-    version: debian/ros-fuerte-catkin_0.4.4_lucid
-- git:
-    local-name: common_msgs
-    uri: git://github.com/wg-debs/common_msgs-release.git
-    version: debian/ros-fuerte-common-msgs_1.8.7_lucid
-- git:
-    local-name: gencpp
-    uri: git://github.com/wg-debs/gencpp-release.git
-    version: debian/ros-fuerte-gencpp_0.3.4_lucid
-- git:
-    local-name: genlisp
-    uri: git://github.com/wg-debs/genlisp-release.git
-    version: debian/ros-fuerte-genlisp_0.3.3_lucid
-- git:
-    local-name: genmsg
-    uri: git://github.com/wg-debs/genmsg-release.git
-    version: debian/ros-fuerte-genmsg_0.3.10_lucid
-- git:
-    local-name: genpy
-    uri: git://github.com/wg-debs/genpy-release.git
-    version: debian/ros-fuerte-genpy_0.3.7_lucid
-- git:
-    local-name: ros
-    uri: git://github.com/wg-debs/ros-release.git
-    version: debian/ros-fuerte-ros_1.8.9_lucid
-- git:
-    local-name: ros_comm
-    uri: git://github.com/wg-debs/ros_comm-release.git
-    version: debian/ros-fuerte-ros-comm_1.8.12_lucid
-- git:
-    local-name: roscpp_core
-    uri: git://github.com/wg-debs/roscpp_core-release.git
-    version: debian/ros-fuerte-roscpp-core_0.2.5_lucid
-- git:
-    local-name: rospack
-    uri: git://github.com/wg-debs/rospack-release.git
-    version: debian/ros-fuerte-rospack_2.0.13_lucid
-- git:
-    local-name: std_msgs
-    uri: git://github.com/wg-debs/std_msgs-release.git
-    version: debian/ros-fuerte-std-msgs_0.4.8_lucid

recipes-ros/ros/rosbash_1.9.42.bb

@@ -0,0 +1,9 @@
+DESCRIPTION = "Assorted shell commands for using ros with bash."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+require ros.inc
+
+S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
+

recipes-ros/ros/rosboost-cfg_1.9.42.bb

@@ -0,0 +1,9 @@
+DESCRIPTION = "Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system"
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+require ros.inc
+
+S = "${WORKDIR}/ros-${PV}/tools/${ROS_BPN}"
+

recipes-ros/ros/rosbuild_1.9.42.bb

@@ -0,0 +1,10 @@
+DESCRIPTION = "rosbuild contains scripts for managing the CMake-based build system for ROS."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = ""
+
+require ros.inc
+
+S = "${WORKDIR}/ros-${PV}/core/${BPN}"

recipes-ros/ros/rosclean_1.9.42.bb

@@ -0,0 +1,9 @@
+DESCRIPTION = "rosclean: cleanup filesystem resources (e.g. log files)"
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+require ros.inc
+
+S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
+

recipes-ros/ros/roscreate_1.9.42.bb

@@ -0,0 +1,9 @@
+DESCRIPTION = "roscreate contains a tool that assists in the creation of ROS filesystem resources."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+require ros.inc
+
+S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
+

recipes-ros/ros/rosmake_1.9.42.bb

@@ -0,0 +1,9 @@
+DESCRIPTION = "rosmake is a ros dependency aware build tool which can be used to build all dependencies in the correct order."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+require ros.inc
+
+S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
+