From 6a5e2c6a3ae654b3dce7d453a81d94edaa7458c3 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 11 Apr 2013 07:58:44 +0200 Subject: [PATCH 1/5] catkin.class: adding package.xml to the shipped packages for rosversion The rosversion command requires that the package.xml are available at run time. The rosversion command is used when starting roscore. --- classes/catkin.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/catkin.bbclass b/classes/catkin.bbclass index 6ab1e99..a9af7c5 100644 --- a/classes/catkin.bbclass +++ b/classes/catkin.bbclass @@ -41,7 +41,6 @@ FILES_${PN} += "\ FILES_${PN}-dev += "\ ${datadir}/${ROS_BPN}/cmake \ - ${datadir}/${ROS_BPN}/package.xml \ ${datadir}/${ROS_BPN}/*.template \ " From 45606f351f8f2e7177316994ef94342f288f43e8 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 11 Apr 2013 08:11:49 +0200 Subject: [PATCH 2/5] roslaunch: improving runtime dependency --- recipes-ros/ros-comm/roslaunch_1.9.41.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-ros/ros-comm/roslaunch_1.9.41.bb b/recipes-ros/ros-comm/roslaunch_1.9.41.bb index 2edfc9a..41b30ef 100644 --- a/recipes-ros/ros-comm/roslaunch_1.9.41.bb +++ b/recipes-ros/ros-comm/roslaunch_1.9.41.bb @@ -16,6 +16,7 @@ RDEPENDS_${PN} = "\ rosgraph-msgs \ genpy \ std-msgs \ + rosout \ " require ros-comm.inc From feb2755614ce89f0802a002950bad8be4be41820 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 11 Apr 2013 08:12:40 +0200 Subject: [PATCH 3/5] core-image-ros-groovy-running-roscore: augmenting hosts --- .../images/core-image-ros-groovy-running-roscore.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/recipes-core/images/core-image-ros-groovy-running-roscore.bb b/recipes-core/images/core-image-ros-groovy-running-roscore.bb index d65e4a7..52f9dbb 100644 --- a/recipes-core/images/core-image-ros-groovy-running-roscore.bb +++ b/recipes-core/images/core-image-ros-groovy-running-roscore.bb @@ -10,8 +10,16 @@ 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 -ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " +# create a custom hosts file +ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; augment_hosts_setting_file ; " IMAGE_INSTALL += "packagegroup-core-ssh-openssh \ roslaunch \ From db0c8d5cd1700174888071a6f617d307a2e050e0 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 11 Apr 2013 11:09:23 +0200 Subject: [PATCH 4/5] roslaunch: adding coreutils as roslaunch needs its du command (resolves #60) --- recipes-ros/ros-comm/roslaunch_1.9.41.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-ros/ros-comm/roslaunch_1.9.41.bb b/recipes-ros/ros-comm/roslaunch_1.9.41.bb index 41b30ef..4bbb883 100644 --- a/recipes-ros/ros-comm/roslaunch_1.9.41.bb +++ b/recipes-ros/ros-comm/roslaunch_1.9.41.bb @@ -4,6 +4,7 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5" RDEPENDS_${PN} = "\ + coreutils \ python-textutils \ python-logging \ python-threading \ From bd6bc4ca47ee7a5d78d622259fe4fd2d39506d56 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 11 Apr 2013 15:19:13 +0200 Subject: [PATCH 5/5] signaling that the running-roscore image is for testing with qemu and x86 setup --- ...oscore.bb => core-image-ros-groovy-qemux86-running-roscore.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-core/images/{core-image-ros-groovy-running-roscore.bb => core-image-ros-groovy-qemux86-running-roscore.bb} (100%) diff --git a/recipes-core/images/core-image-ros-groovy-running-roscore.bb b/recipes-core/images/core-image-ros-groovy-qemux86-running-roscore.bb similarity index 100% rename from recipes-core/images/core-image-ros-groovy-running-roscore.bb rename to recipes-core/images/core-image-ros-groovy-qemux86-running-roscore.bb