catkin-changes

meta-intel-aero.diff

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 990b4cc..02c0864 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -18,4 +18,5 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-intel-realsense \
   ##OEROOT##/../meta-intel-aero-base \
   ##OEROOT##/../meta-intel-aero \
+  ##OEROOT##/../meta-ros \
   "
diff --git a/recipes-core/images/intel-aero-image.bb b/recipes-core/images/intel-aero-image.bb
index 3649766..5c1f28b 100644
--- a/recipes-core/images/intel-aero-image.bb
+++ b/recipes-core/images/intel-aero-image.bb
@@ -20,6 +20,7 @@ IMAGE_INSTALL += "gstreamer1.0 gst-player \
 				gstreamer1.0-meta-base gstreamer1.0-rtsp-server \
 				jam-stapl \
 				px4-fw \
+				catkin \
 				"
 
 IMAGE_INSTALL += "camera-streaming-daemon"

meta-ros.diff

diff --git a/recipes-ros/catkin/catkin-runtime_0.6.19.bb b/recipes-ros/catkin/catkin-runtime_0.6.19.bb
index a63ec53..f1aeb03 100644
--- a/recipes-ros/catkin/catkin-runtime_0.6.19.bb
+++ b/recipes-ros/catkin/catkin-runtime_0.6.19.bb
@@ -7,7 +7,7 @@ S = "${WORKDIR}/catkin-${PV}"
 # This package includes ONLY the python packages AND catkin_find
 # The catkin_${PV} package includes all other files
 # from the catkin tool.
-FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR} ${ros_bindir}/catkin_find"
+FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR} ${ros_bindir}/catkin_find ${ros_datadir} ${ros_libdir}/pkgconfig /opt/ros/indigo/.catkin"
 
 RDEPENDS_${PN}_class-native = ""
 RDEPENDS_${PN} = "\
@@ -19,8 +19,8 @@ RDEPENDS_${PN} = "\
 do_install_append() {
     rm  ${D}${ros_bindir}/catkin_*_*
     rm  ${D}${ros_bindir}/catkin_make
-    rm -rf ${D}${ros_datadir}
-    rm -rf ${D}${ros_libdir}/pkgconfig
+  #  rm -rf ${D}${ros_datadir}
+  #  rm -rf ${D}${ros_libdir}/pkgconfig
 }
 
 BBCLASSEXTEND += "native"
diff --git a/recipes-ros/catkin/catkin_0.6.19.bb b/recipes-ros/catkin/catkin_0.6.19.bb
index b09e07c..acf44bd 100644
--- a/recipes-ros/catkin/catkin_0.6.19.bb
+++ b/recipes-ros/catkin/catkin_0.6.19.bb
@@ -12,9 +12,9 @@ RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++
 # Moreover: the ${ros_libdir}/python2.7 is empty. We need to
 # remove it, otherwise the QA error [installed-vs-shipped] will hit on us.
 do_install_append() {
-    rm ${D}${ros_bindir}/catkin_find
-    rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}
-    rmdir ${D}${ros_libdir}/python2.7
+   # rm ${D}${ros_bindir}/catkin_find
+   # rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}
+   # rmdir ${D}${ros_libdir}/python2.7
 }
 
 BBCLASSEXTEND += "native"