From bf9664c62b65ea3187ac8c5c93a7dda1b3f4136b Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 3 Aug 2013 10:27:11 +0200
Subject: [PATCH 01/11] rospack: improving runtime dependencies (resolves #116)

This commit includes further changes to build rospack-native.
---
 recipes-devtools/python/python-native_2.7.3.bbappend | 2 +-
 recipes-devtools/python/python-rosdep_0.10.11.bb     | 7 +++----
 recipes-ros/rospack/rospack_2.1.21.bb                | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-devtools/python/python-native_2.7.3.bbappend b/recipes-devtools/python/python-native_2.7.3.bbappend
index 90bc835..e742099 100644
--- a/recipes-devtools/python/python-native_2.7.3.bbappend
+++ b/recipes-devtools/python/python-native_2.7.3.bbappend
@@ -1 +1 @@
-RPROVIDES += "python-xml-native"
+RPROVIDES += "python-datetime-native python-netclient-native python-subprocess-native python-xml-native"
diff --git a/recipes-devtools/python/python-rosdep_0.10.11.bb b/recipes-devtools/python/python-rosdep_0.10.11.bb
index 64004a8..993ce4d 100644
--- a/recipes-devtools/python/python-rosdep_0.10.11.bb
+++ b/recipes-devtools/python/python-rosdep_0.10.11.bb
@@ -10,9 +10,8 @@ SRC_URI[sha256sum] = "c3e741db57b7230c8ac2cceca837b98181b4fa6d1488819e615366a858
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-# install_requires=['catkin_pkg', 'rospkg', 'PyYAML >= 3.1'],
-# setup_requires=['nose >= 1.0'],
-
-RDEPENDS_${PN} += "python-catkin-pkg python-rospkg python-pyyaml"
+RDEPENDS_${PN} += "python-catkin-pkg python-rospkg python-pyyaml python-netclient"
 
 inherit setuptools
+
+BBCLASSEXTEND += "native"
diff --git a/recipes-ros/rospack/rospack_2.1.21.bb b/recipes-ros/rospack/rospack_2.1.21.bb
index b172acb..3610377 100644
--- a/recipes-ros/rospack/rospack_2.1.21.bb
+++ b/recipes-ros/rospack/rospack_2.1.21.bb
@@ -4,6 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "boost python-rospkg-native libtinyxml"
+RDEPENDS_${PN} = "python-rosdep python-subprocess"
 
 SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
 SRC_URI[md5sum] = "0bb1d12a115b7902d5b1f8546d63cdf8"

From 9faf9c529222488da791c55ecc2221c2c4a18323 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 08:59:17 +0200
Subject: [PATCH 02/11] libpoco: openssl required for libpoco when compiling
 pcl-ros

When compiling pcl-ros, bitbake aborts because for compiling the
Crypto library in libpoco, it needs the openssl headers.

The condensed error output is

** Compiling src/CipherKeyImpl.cpp (debug, shared)
arm-oe-linux-gnueabi-g++  -march=armv5te -marm -mthumb-interwork
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed
--sysroot=/home/lukas/oe-core/build/tmp-eglibc/sysroots/qemuarm
-I ... -DPOCO_BUILD_HOST=host -DPOCO_NO_WSTRING -DPOCO_UNBUNDLED
-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT -D_THREAD_SAFE
-DPOCO_NO_FPENVIRONMENT  -g -D_DEBUG -fPIC -c src/CipherKeyImpl.cpp
-o ...
In file included from include/Poco/Crypto/CipherKeyImpl.h:44:0,
                 from include/Poco/Crypto/CipherKey.h:44,
                 from src/CipherKey.cpp:37:
include/Poco/Crypto/OpenSSLInitializer.h:45:33: fatal error: openssl/opensslconf.h: No such file or directory
 #include <openssl/opensslconf.h>
                                 ^
compilation terminated.
In file included from include/Poco/Crypto/CipherKeyImpl.h:44:0,
                 from src/CipherKeyImpl.cpp:37:
include/Poco/Crypto/OpenSSLInitializer.h:45:33: fatal error: openssl/opensslconf.h: No such file or directory
 #include <openssl/opensslconf.h>
                                 ^
compilation terminated.
make[1]: *** [.../tmp-eglibc/work/armv5te-oe-linux-gnueabi/libpoco/1.4.6p1-r0/poco-1.4.6p1-all/Crypto/obj/Linux/armv5te/debug_shared/CipherKey.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make -C /home/lukas/oe-core/build/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libpoco/1.4.6p1-r0/poco-1.4.6p1-all/Util
make[1]: *** [.../tmp-eglibc/work/armv5te-oe-linux-gnueabi/libpoco/1.4.6p1-r0/poco-1.4.6p1-all/Crypto/obj/Linux/armv5te/debug_shared/CipherKeyImpl.o] Error 1
make[1]: Entering directory `/home/lukas/oe-core/build/tmp-eglibc/work/armv5te-oe-linux-gnueabi/libpoco/1.4.6p1-r0/poco-1.4.6p1-all/Util'
---
 recipes-extended/libpoco/libpoco_1.4.6p1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libpoco/libpoco_1.4.6p1.bb b/recipes-extended/libpoco/libpoco_1.4.6p1.bb
index 411af13..6b5f674 100644
--- a/recipes-extended/libpoco/libpoco_1.4.6p1.bb
+++ b/recipes-extended/libpoco/libpoco_1.4.6p1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pocoproject.org"
 LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-DEPENDS = "expat zlib libpcre"
+DEPENDS = "expat zlib libpcre openssl"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poco/poco-${PV}-all.tar.bz2 \
            file://OE \

From a51044ef7bfa20c2a0ca958272f4f4283cfde966 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 11:04:29 +0200
Subject: [PATCH 03/11] cleaning up recipes-devtools/python recipes

---
 recipes-devtools/python/python-catkin-pkg_0.1.16.bb | 2 --
 recipes-devtools/python/python-empy_3.3.bb          | 5 -----
 recipes-devtools/python/python-pyyaml_3.10.bb       | 8 ++------
 recipes-devtools/python/python-rosinstall_0.6.21.bb | 2 --
 recipes-devtools/python/python-rospkg_1.0.15.bb     | 2 --
 recipes-devtools/python/python-vcstools_0.1.26.bb   | 2 --
 recipes-devtools/python/python-wstool_0.0.2.bb      | 1 -
 7 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/recipes-devtools/python/python-catkin-pkg_0.1.16.bb b/recipes-devtools/python/python-catkin-pkg_0.1.16.bb
index b8cbc72..bc82fc2 100644
--- a/recipes-devtools/python/python-catkin-pkg_0.1.16.bb
+++ b/recipes-devtools/python/python-catkin-pkg_0.1.16.bb
@@ -12,6 +12,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-DEPENDS += "python"
-DEPENDS_class-native  += "python-native"
 BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/python/python-empy_3.3.bb b/recipes-devtools/python/python-empy_3.3.bb
index dd16e90..fb5e417 100644
--- a/recipes-devtools/python/python-empy_3.3.bb
+++ b/recipes-devtools/python/python-empy_3.3.bb
@@ -10,11 +10,6 @@ SRC_URI[sha256sum] = "c625436d03cff8adbbade639d14a2df9bc4c4de99ec3a821ad4d6eeb66
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-# RDEPENDS = "python-modules"
-
 inherit distutils
 
-DEPENDS += "python"
-DEPENDS_class-native  += "python-native"
 BBCLASSEXTEND = "native"
-
diff --git a/recipes-devtools/python/python-pyyaml_3.10.bb b/recipes-devtools/python/python-pyyaml_3.10.bb
index bb8e26f..aacebaf 100644
--- a/recipes-devtools/python/python-pyyaml_3.10.bb
+++ b/recipes-devtools/python/python-pyyaml_3.10.bb
@@ -11,12 +11,8 @@ SRC_URI[sha256sum] = "e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit distutils
-
-DEPENDS += "python"
-DEPENDS_class-native  += "python-native"
-
 RDEPENDS_${PN} = "python-datetime"
 
-BBCLASSEXTEND = "native"
+inherit distutils
 
+BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/python/python-rosinstall_0.6.21.bb b/recipes-devtools/python/python-rosinstall_0.6.21.bb
index d955a1c..09e84c1 100644
--- a/recipes-devtools/python/python-rosinstall_0.6.21.bb
+++ b/recipes-devtools/python/python-rosinstall_0.6.21.bb
@@ -10,9 +10,7 @@ SRC_URI[sha256sum] = "7163106c93460c8d092c5e74749cefd3fc17295f3a06c4f041fe83a772
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-# install_requires=['vcstools', 'pyyaml'],
 DEPENDS += "python-vcstools python-pyyaml"
 RDEPENDS_${PN} = "python-vcstools"
 
 inherit setuptools
-
diff --git a/recipes-devtools/python/python-rospkg_1.0.15.bb b/recipes-devtools/python/python-rospkg_1.0.15.bb
index a38a210..893bf03 100644
--- a/recipes-devtools/python/python-rospkg_1.0.15.bb
+++ b/recipes-devtools/python/python-rospkg_1.0.15.bb
@@ -14,6 +14,4 @@ RDEPENDS_${PN} += "python-xml"
 
 inherit setuptools
 
-DEPENDS += "python"
 BBCLASSEXTEND = "native"
-
diff --git a/recipes-devtools/python/python-vcstools_0.1.26.bb b/recipes-devtools/python/python-vcstools_0.1.26.bb
index ac2a3bc..3e57adc 100644
--- a/recipes-devtools/python/python-vcstools_0.1.26.bb
+++ b/recipes-devtools/python/python-vcstools_0.1.26.bb
@@ -10,8 +10,6 @@ SRC_URI[sha256sum] = "11cae4907609d3524655c7cdba66260821f69fd2ff2330ae93db35111c
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-# install_requires=['pyyaml','python-dateutil']
 RDEPENDS_${PN} += "python-pyyaml python-dateutil"
 
 inherit setuptools
-
diff --git a/recipes-devtools/python/python-wstool_0.0.2.bb b/recipes-devtools/python/python-wstool_0.0.2.bb
index 1dd82b7..993ab1a 100644
--- a/recipes-devtools/python/python-wstool_0.0.2.bb
+++ b/recipes-devtools/python/python-wstool_0.0.2.bb
@@ -10,7 +10,6 @@ SRC_URI[sha256sum] = "487602f7d5bef1e0b759c60ab4b86db884dd2abfb756e1743ad4ae3754
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-# install_requires=['vcstools', 'pyyaml', 'rosinstall'],
 RDEPENDS_${PN} += "python-vcstools python-pyyaml python-rosinstall"
 
 inherit setuptools

From 9d48c558cd58a87c7a9662a8c8705f298b46901d Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 11:20:07 +0200
Subject: [PATCH 04/11] catkin class includes BBCLASSEXTENDS

---
 recipes-ros/catkin/catkin_0.5.71.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-ros/catkin/catkin_0.5.71.bb b/recipes-ros/catkin/catkin_0.5.71.bb
index c39be3d..d39e762 100644
--- a/recipes-ros/catkin/catkin_0.5.71.bb
+++ b/recipes-ros/catkin/catkin_0.5.71.bb
@@ -4,8 +4,8 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "cmake python-empy python-catkin-pkg python-empy-native python-catkin-pkg-native"
-RDEPENDS_${PN}_class-native = ""
 
+RDEPENDS_${PN}_class-native = ""
 RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++-symlinks \
     python-catkin-pkg python-argparse python-misc python-multiprocessing \
     python-shell python-subprocess python-xml"
@@ -27,5 +27,3 @@ FILES_${PN}-dev += "\
     ${prefix}/env.sh \
     ${prefix}/setup.* \
     "
-
-BBCLASSEXTEND += "native"

From 2712004be96948cf21f470f4c2d4385eb8d0c6bf Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 12:39:38 +0200
Subject: [PATCH 05/11] roscpp-core: collected common definition in .inc file

---
 recipes-ros/roscpp-core/cpp-common_0.3.16.bb           | 2 --
 recipes-ros/roscpp-core/roscpp-core.inc                | 2 +-
 recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb | 2 --
 recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb        | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/recipes-ros/roscpp-core/cpp-common_0.3.16.bb b/recipes-ros/roscpp-core/cpp-common_0.3.16.bb
index b8764bc..dfa645c 100644
--- a/recipes-ros/roscpp-core/cpp-common_0.3.16.bb
+++ b/recipes-ros/roscpp-core/cpp-common_0.3.16.bb
@@ -4,5 +4,3 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 require roscpp-core.inc
-
-S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/roscpp-core.inc b/recipes-ros/roscpp-core/roscpp-core.inc
index 71a19cf..0aa7f98 100644
--- a/recipes-ros/roscpp-core/roscpp-core.inc
+++ b/recipes-ros/roscpp-core/roscpp-core.inc
@@ -2,6 +2,6 @@ SRC_URI = "https://github.com/ros/roscpp_core/archive/${PV}.tar.gz;downloadfilen
 SRC_URI[md5sum] = "d02c9d1270d1f68487944fb0e76adcb7"
 SRC_URI[sha256sum] = "805b08c5b7044dd93bfaf4a0dd5807b391d1d86db9f6d143f9946b5528500eda"
 
-S = "${WORKDIR}/roscpp_core-${PV}/${BPN}"
+S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
 
 inherit catkin
diff --git a/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb b/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb
index 03a2833..07bd9ef 100644
--- a/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb
+++ b/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb
@@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9de
 DEPENDS = "cpp-common roscpp-traits rostime"
 
 require roscpp-core.inc
-
-S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb b/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb
index f3c21f2..9039bfd 100644
--- a/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb
+++ b/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb
@@ -4,5 +4,3 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 require roscpp-core.inc
-
-S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"

From 1b746e8d45b160d5a42fd77e7ffa295646abbb27 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 17:22:38 +0200
Subject: [PATCH 06/11] ros: removing superfluous definitions

---
 recipes-ros/ros/mk_1.10.4.bb       | 2 --
 recipes-ros/ros/rosbuild_1.10.4.bb | 2 --
 recipes-ros/ros/rosunit_1.10.4.bb  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/recipes-ros/ros/mk_1.10.4.bb b/recipes-ros/ros/mk_1.10.4.bb
index 361d701..608f111 100644
--- a/recipes-ros/ros/mk_1.10.4.bb
+++ b/recipes-ros/ros/mk_1.10.4.bb
@@ -3,8 +3,6 @@ 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}"
diff --git a/recipes-ros/ros/rosbuild_1.10.4.bb b/recipes-ros/ros/rosbuild_1.10.4.bb
index 2c307ec..b65e743 100644
--- a/recipes-ros/ros/rosbuild_1.10.4.bb
+++ b/recipes-ros/ros/rosbuild_1.10.4.bb
@@ -3,8 +3,6 @@ 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}"
diff --git a/recipes-ros/ros/rosunit_1.10.4.bb b/recipes-ros/ros/rosunit_1.10.4.bb
index 3bf8232..4679440 100644
--- a/recipes-ros/ros/rosunit_1.10.4.bb
+++ b/recipes-ros/ros/rosunit_1.10.4.bb
@@ -8,5 +8,3 @@ require ros.inc
 SRC_URI += "file://0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch;striplevel=3"
 
 S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
-
-BBCLASSEXTEND += "native"

From 521448ca5d67b1cab528b81c53af18d792cb2621 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 12:36:14 +0200
Subject: [PATCH 07/11] images: cleaned and renamed image recipe

---
 ...mage-ros-groovy-qemux86-running-roscore.bb | 26 -------------------
 recipes-core/images/core-image-ros-roscore.bb | 16 ++++++++++++
 2 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 recipes-core/images/core-image-ros-groovy-qemux86-running-roscore.bb
 create mode 100644 recipes-core/images/core-image-ros-roscore.bb

diff --git a/recipes-core/images/core-image-ros-groovy-qemux86-running-roscore.bb b/recipes-core/images/core-image-ros-groovy-qemux86-running-roscore.bb
deleted file mode 100644
index 52f9dbb..0000000
--- a/recipes-core/images/core-image-ros-groovy-qemux86-running-roscore.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "A small image just capable of starting roscore."
-
-IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
-
-IMAGE_LINGUAS = " "
-
-LICENSE = "MIT"
-
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-
-# add own name to hosts
-# this is a simplistic setup for the qemu virtual machine with x86 architecture,
-# and not a general solution.
-augment_hosts_setting_file () {
-	echo '127.0.0.1\tqemux86.localdomain\t\tqemux86' >> ${IMAGE_ROOTFS}/etc/hosts
-}
-
-# remove not needed ipkg informations
-# create a custom hosts file
-ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; augment_hosts_setting_file ; "
-
-IMAGE_INSTALL += "packagegroup-core-ssh-openssh \
-  roslaunch \
-"
diff --git a/recipes-core/images/core-image-ros-roscore.bb b/recipes-core/images/core-image-ros-roscore.bb
new file mode 100644
index 0000000..a8bdb2e
--- /dev/null
+++ b/recipes-core/images/core-image-ros-roscore.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A small image just capable of starting roscore."
+
+IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
+
+IMAGE_LINGUAS = " "
+
+LICENSE = "MIT"
+
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
+
+# remove not needed ipkg informations
+ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files"
+
+IMAGE_INSTALL += "roslaunch"

From a0a2aa9eaf75da69999f21244b17f9e780893df9 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 12:44:40 +0200
Subject: [PATCH 08/11] tuning newlines

---
 conf/layer.conf                                    | 2 +-
 recipes-devtools/yaml-cpp/yaml-cpp_0.3.0.bb        | 1 -
 recipes-ros/common-msgs/actionlib-msgs_1.10.0.bb   | 1 -
 recipes-ros/common-msgs/diagnostic-msgs_1.10.0.bb  | 2 +-
 recipes-ros/console-bridge/console-bridge_0.2.4.bb | 1 -
 recipes-ros/image-common/image-transport_1.11.0.bb | 1 -
 recipes-ros/ros/rosbash_1.10.4.bb                  | 1 -
 recipes-ros/ros/rosboost-cfg_1.10.4.bb             | 1 -
 recipes-ros/ros/rosclean_1.10.4.bb                 | 1 -
 recipes-ros/ros/roscreate_1.10.4.bb                | 1 -
 recipes-ros/ros/rosmake_1.10.4.bb                  | 1 -
 11 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 2ee3929..2fc56b5 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,4 +6,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "ros-layer"
 BBFILE_PATTERN_ros-layer := "^${LAYERDIR}/"
-BBFILE_PRIORITY_ros-layer = "7"
\ No newline at end of file
+BBFILE_PRIORITY_ros-layer = "7"
diff --git a/recipes-devtools/yaml-cpp/yaml-cpp_0.3.0.bb b/recipes-devtools/yaml-cpp/yaml-cpp_0.3.0.bb
index f87fb51..5a2c306 100644
--- a/recipes-devtools/yaml-cpp/yaml-cpp_0.3.0.bb
+++ b/recipes-devtools/yaml-cpp/yaml-cpp_0.3.0.bb
@@ -9,7 +9,6 @@ PR = "r0"
 S = "${WORKDIR}/${PN}"
 
 SRC_URI = "http://yaml-cpp.googlecode.com/files/yaml-cpp-${PV}.tar.gz"
-
 SRC_URI[md5sum] = "9aa519205a543f9372bf4179071c8ac6"
 SRC_URI[sha256sum] = "2cd038b5a1583b6745e949e196fba525f6d0d5fd340566585fde24fc7e117b82"
 
diff --git a/recipes-ros/common-msgs/actionlib-msgs_1.10.0.bb b/recipes-ros/common-msgs/actionlib-msgs_1.10.0.bb
index f42de87..914abd9 100644
--- a/recipes-ros/common-msgs/actionlib-msgs_1.10.0.bb
+++ b/recipes-ros/common-msgs/actionlib-msgs_1.10.0.bb
@@ -5,4 +5,3 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 require common-msgs.inc
-
diff --git a/recipes-ros/common-msgs/diagnostic-msgs_1.10.0.bb b/recipes-ros/common-msgs/diagnostic-msgs_1.10.0.bb
index 919ac0c..256436c 100644
--- a/recipes-ros/common-msgs/diagnostic-msgs_1.10.0.bb
+++ b/recipes-ros/common-msgs/diagnostic-msgs_1.10.0.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "\This package holds the diagnostic messages which provide the \
+DESCRIPTION = "This package holds the diagnostic messages which provide the \
 standardized interface for the diagnostic and runtime monitoring systems in ROS."
 SECTION = "devel"
 LICENSE = "BSD"
diff --git a/recipes-ros/console-bridge/console-bridge_0.2.4.bb b/recipes-ros/console-bridge/console-bridge_0.2.4.bb
index 0df8ba8..cf9c488 100644
--- a/recipes-ros/console-bridge/console-bridge_0.2.4.bb
+++ b/recipes-ros/console-bridge/console-bridge_0.2.4.bb
@@ -24,4 +24,3 @@ inherit cmake
 
 FILES_SOLIBSDEV = ""
 FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
-
diff --git a/recipes-ros/image-common/image-transport_1.11.0.bb b/recipes-ros/image-common/image-transport_1.11.0.bb
index 2665674..fa6cff3 100644
--- a/recipes-ros/image-common/image-transport_1.11.0.bb
+++ b/recipes-ros/image-common/image-transport_1.11.0.bb
@@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de
 DEPENDS = "message-filters pluginlib rosconsole roscpp roslib sensor-msgs"
 
 require image-common.inc
-
diff --git a/recipes-ros/ros/rosbash_1.10.4.bb b/recipes-ros/ros/rosbash_1.10.4.bb
index 6aff5ba..e4ab00a 100644
--- a/recipes-ros/ros/rosbash_1.10.4.bb
+++ b/recipes-ros/ros/rosbash_1.10.4.bb
@@ -8,4 +8,3 @@ require ros.inc
 RDEPENDS_${PN} = "bash findutils"
 
 S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
-
diff --git a/recipes-ros/ros/rosboost-cfg_1.10.4.bb b/recipes-ros/ros/rosboost-cfg_1.10.4.bb
index 783e140..a229ef5 100644
--- a/recipes-ros/ros/rosboost-cfg_1.10.4.bb
+++ b/recipes-ros/ros/rosboost-cfg_1.10.4.bb
@@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc
 require ros.inc
 
 S = "${WORKDIR}/ros-${PV}/tools/${ROS_BPN}"
-
diff --git a/recipes-ros/ros/rosclean_1.10.4.bb b/recipes-ros/ros/rosclean_1.10.4.bb
index 68b4d35..dcb02cc 100644
--- a/recipes-ros/ros/rosclean_1.10.4.bb
+++ b/recipes-ros/ros/rosclean_1.10.4.bb
@@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc
 require ros.inc
 
 S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
-
diff --git a/recipes-ros/ros/roscreate_1.10.4.bb b/recipes-ros/ros/roscreate_1.10.4.bb
index 3dcf63d..312d466 100644
--- a/recipes-ros/ros/roscreate_1.10.4.bb
+++ b/recipes-ros/ros/roscreate_1.10.4.bb
@@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de
 require ros.inc
 
 S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
-
diff --git a/recipes-ros/ros/rosmake_1.10.4.bb b/recipes-ros/ros/rosmake_1.10.4.bb
index 542b17f..0241519 100644
--- a/recipes-ros/ros/rosmake_1.10.4.bb
+++ b/recipes-ros/ros/rosmake_1.10.4.bb
@@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc
 require ros.inc
 
 S = "${WORKDIR}/ros-${PV}/tools/${BPN}"
-

From 50f3e76c1d9be2326e287b393b8ccc5fd4b20d49 Mon Sep 17 00:00:00 2001
From: vmayoral <v.mayoralv@gmail.com>
Date: Sun, 28 Jul 2013 14:58:14 +0200
Subject: [PATCH 09/11] initial ros-tutorials and common-tutorials recipes
 (resolves #124)

---
 recipes-ros/common-tutorials/common-tutorials.inc    |  7 +++++++
 .../common-tutorials/nodelet-tutorial-math_0.1.7.bb  |  8 ++++++++
 .../common-tutorials/pluginlib-tutorials_0.1.7.bb    |  8 ++++++++
 recipes-ros/ros-tutorials/ros-tutorials.inc          |  7 +++++++
 recipes-ros/ros-tutorials/roscpp-tutorials_0.3.11.bb |  8 ++++++++
 recipes-ros/ros-tutorials/rospy-tutorials_0.3.11.bb  | 12 ++++++++++++
 6 files changed, 50 insertions(+)
 create mode 100644 recipes-ros/common-tutorials/common-tutorials.inc
 create mode 100644 recipes-ros/common-tutorials/nodelet-tutorial-math_0.1.7.bb
 create mode 100644 recipes-ros/common-tutorials/pluginlib-tutorials_0.1.7.bb
 create mode 100644 recipes-ros/ros-tutorials/ros-tutorials.inc
 create mode 100644 recipes-ros/ros-tutorials/roscpp-tutorials_0.3.11.bb
 create mode 100644 recipes-ros/ros-tutorials/rospy-tutorials_0.3.11.bb

diff --git a/recipes-ros/common-tutorials/common-tutorials.inc b/recipes-ros/common-tutorials/common-tutorials.inc
new file mode 100644
index 0000000..ee7f39b
--- /dev/null
+++ b/recipes-ros/common-tutorials/common-tutorials.inc
@@ -0,0 +1,7 @@
+SRC_URI = "https://github.com/ros/common_tutorials/archive/${PV}.tar.gz;downloadfilename=common_tutorials-${PV}.tar.gz"
+SRC_URI[md5sum] = "0055265f3854afcf4cc0abff06a9f023"
+SRC_URI[sha256sum] = "257f45f36463d5ffc04e1d60ac1fc6a2e7c1b11d012daa43b2eb43001383048c"
+
+S = "${WORKDIR}/common_tutorials-${PV}/${ROS_BPN}"
+
+inherit catkin
diff --git a/recipes-ros/common-tutorials/nodelet-tutorial-math_0.1.7.bb b/recipes-ros/common-tutorials/nodelet-tutorial-math_0.1.7.bb
new file mode 100644
index 0000000..5f3de13
--- /dev/null
+++ b/recipes-ros/common-tutorials/nodelet-tutorial-math_0.1.7.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "nodelet_tutorial_math ROS package"
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = "roscpp nodelet std-msgs"
+
+require common-tutorials.inc
diff --git a/recipes-ros/common-tutorials/pluginlib-tutorials_0.1.7.bb b/recipes-ros/common-tutorials/pluginlib-tutorials_0.1.7.bb
new file mode 100644
index 0000000..1a2b14a
--- /dev/null
+++ b/recipes-ros/common-tutorials/pluginlib-tutorials_0.1.7.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "pluginlib_tutorials ROS package"
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = "roscpp pluginlib"
+
+require common-tutorials.inc
diff --git a/recipes-ros/ros-tutorials/ros-tutorials.inc b/recipes-ros/ros-tutorials/ros-tutorials.inc
new file mode 100644
index 0000000..403171b
--- /dev/null
+++ b/recipes-ros/ros-tutorials/ros-tutorials.inc
@@ -0,0 +1,7 @@
+SRC_URI = "https://github.com/ros/ros_tutorials/archive/${PV}.tar.gz;downloadfilename=ros_tutorials-${PV}.tar.gz;name=archive"
+SRC_URI[archive.md5sum] = "e1763e2ccc91976ac98b07d3f423478d"
+SRC_URI[archive.sha256sum] = "827622a42eb14119c3303665c91635fd4c1eb401e1585a9f1fde819f7651bdbf"
+
+S = "${WORKDIR}/ros_tutorials-${PV}/${ROS_BPN}"
+
+inherit catkin
diff --git a/recipes-ros/ros-tutorials/roscpp-tutorials_0.3.11.bb b/recipes-ros/ros-tutorials/roscpp-tutorials_0.3.11.bb
new file mode 100644
index 0000000..9cb204c
--- /dev/null
+++ b/recipes-ros/ros-tutorials/roscpp-tutorials_0.3.11.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "This package contains step-by-step tutorials written in C++ for learning ROS."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = "message-generation roscpp rosconsole roscpp-serialization rostime std-msgs"
+
+require ros-tutorials.inc
diff --git a/recipes-ros/ros-tutorials/rospy-tutorials_0.3.11.bb b/recipes-ros/ros-tutorials/rospy-tutorials_0.3.11.bb
new file mode 100644
index 0000000..6a5e832
--- /dev/null
+++ b/recipes-ros/ros-tutorials/rospy-tutorials_0.3.11.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "This package contains step-by-step tutorials written python for learning ROS"
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = "message-generation rostest std-msgs cpp-common roscpp-serialization"
+
+require ros-tutorials.inc
+
+SRC_URI += "https://github.com/ros/ros_tutorials/commit/1e559b3f811a6cf3daac59088d6d86ca1d31b261.patch;striplevel=2;name=patch"
+SRC_URI[patch.md5sum] = "c9e4af54266205ad233acc064a456840"
+SRC_URI[patch.sha256sum] = "838ad3cbe2da1c625a44af80c4351f1187478e6ec52adc1c535942337252a719"

From bc9ae99a7c0ce18d0b8e545b659bd174a01235e6 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 3 Aug 2013 12:21:05 +0200
Subject: [PATCH 10/11] README: was updated to hydro; core-image was renamed

---
 README | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 27017b8..77739aa 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is a layer to provide ROS Groovy Galapagos in an OpenEmbedded Linux system.
+This is a layer to provide ROS Hydromedusa in an OpenEmbedded Linux system.
 Currently, this layer is still under development and only provides 
 cross-compilation of the basic ros-comm packages.
 
@@ -58,17 +58,22 @@ USAGE
 
   Look at the meta-ros test reports for the description of the current state.
 
-
-  The recipe core-image-ros-groovy-qemux86-running-roscore provides a minimal
-  Linux system that runs roscore on the qemu x86 virtual machine.
+  The recipe core-image-ros-roscore provides a minimal Linux system that runs
+  roscore.
 
   You can compile the minimal Linux system with
-    bitbake core-image-ros-groovy-qemux86-running-roscore
+    bitbake core-image-ros-roscore
 
-  Then, you start this system with
-    runqemu qemux86 core-image-ros-groovy-qemux86-running-roscore
+  Then for example, you start this system in the qemu virtual machine with
+    runqemu <MACHINE> core-image-ros-roscore
+
+  
+  On the Linux system, ensure that the own host's name in resolved by adding
+  
+    127.0.0.1	<HOSTNAME>.localdomain		<HOSTNAME>
+
+  to the /etc/hosts file, and set up the environment with
 
-  In the qemu shell, set up the environment with
     export ROS_ROOT=/usr
     export ROS_MASTER_URI=http://localhost:11311
     export CMAKE_PREFIX_PATH=/usr

From e9f2edde182fb7062e70bfcf321f8c49e7db9f89 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 4 Aug 2013 10:38:17 +0200
Subject: [PATCH 11/11] CONTENTS: adjusted to current state and tuned
 formatting

This commit renames file CONTENT to CONTENTS, reflecting its
intended meaning. For the difference between the two words, see
http://english.stackexchange.com/questions/13556/content-or-contents
---
 CONTENT  | 10 ----------
 CONTENTS |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 CONTENT
 create mode 100644 CONTENTS

diff --git a/CONTENT b/CONTENT
deleted file mode 100644
index 1ec44cd..0000000
--- a/CONTENT
+++ /dev/null
@@ -1,10 +0,0 @@
-CONTENT of the repository:
-
-* README                                                   the README file, which contains all important information
-* COPYING.MIT                                              MIT license
-* conf/layer.conf                                          configuration file for this layer
-* classes/catkin.bbclass                                   class for catkin-based packages
-* recipes-core/images                                      recipes of images for native compilation of ROS
-* recipes-devtools                                         recipes of system prerequisites of ROS
-* recipes-ros                                              recipes for cross-compiling ROS packages
-
diff --git a/CONTENTS b/CONTENTS
new file mode 100644
index 0000000..4aee278
--- /dev/null
+++ b/CONTENTS
@@ -0,0 +1,9 @@
+CONTENTS of the repository:
+
+* README                    the README file with all important information
+* COPYING.MIT               MIT license
+* conf/layer.conf           configuration file for this layer
+* classes/catkin.bbclass    class for catkin-based packages
+* recipes-core/images       recipes of images for using ROS
+* recipes-devtools          recipes of system prerequisites of ROS
+* recipes-ros               recipes for cross-compiling ROS packages