Merge pull request #564 from bulwahn/cleanup

clean up to prepare merging content from #519

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

@@ -4,13 +4,14 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709"
 SRCNAME = "rosinstall"
 
+DEPENDS = "python-vcstools python-pyyaml"
+
 SRC_URI = "http://download.ros.org/downloads/rosinstall/rosinstall-${PV}.tar.gz"
 SRC_URI[md5sum] = "b52ea80b199efdb94e35229eb427965f"
 SRC_URI[sha256sum] = "2ba808bf8bac2cc3f13af9745184b9714c1426e11d09eb96468611b2ad47ed40"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-DEPENDS += "python-vcstools python-pyyaml"
 RDEPENDS_${PN} = "python-vcstools"
 
 inherit setuptools

recipes-ros/audio-common/audio-common-msgs_0.2.12.bb

@@ -3,7 +3,7 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=a3ae2ba3f0f44e61270955e8cd98afcf"
 
-DEPENDS += "message-generation"
+DEPENDS = "message-generation"
 
 require audio-common.inc
 

recipes-ros/audio-common/sound-play_0.2.12.bb

@@ -7,7 +7,7 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=a3ae2ba3f0f44e61270955e8cd98afcf"
 
-DEPENDS += "roscpp roslib audio-common-msgs diagnostic-msgs"
+DEPENDS = "roscpp roslib audio-common-msgs diagnostic-msgs"
 
 require audio-common.inc
 

recipes-ros/geometry2/tf2-py_0.5.16.bb

@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de
 
 DEPENDS = "rospy tf2"
 
-EXTRA_OECMAKE += "\
+EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON"
-    -DCMAKE_SKIP_RPATH=ON \
-    "
 
 require geometry2.inc
 

recipes-ros/hector-slam/hector-mapping_0.3.5.bb

@@ -5,6 +5,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=19;endline=19;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-require hector-slam.inc
-
 DEPENDS = "cmake-modules message-runtime boost nav-msgs visualization-msgs tf message-filters laser-geometry tf-conversions"
+
+require hector-slam.inc

recipes-ros/household-objects-database-msgs/household-objects-database-msgs_0.1.2.bb

@@ -12,5 +12,3 @@ SRC_URI[sha256sum] = "1ab82ef50d580635a7248c83585e641687aa32465c766ebcda5f044778
 S = "${WORKDIR}/${ROS_SP}"
 
 inherit catkin
-
-ROS_SPN = "household_objects_database_msgs"

recipes-ros/manipulation-msgs/manipulation-msgs_0.2.1.bb

@@ -12,5 +12,3 @@ SRC_URI[sha256sum] = "b34fae176367ff727876959e5f40eafeb9a7c158424bc288ae7eb9045e
 S = "${WORKDIR}/${ROS_SP}"
 
 inherit catkin
-
-ROS_SPN = "manipulation_msgs"

recipes-ros/mavlink/mavlink_git.bb

@@ -2,6 +2,8 @@ DESCRIPTION = "MAVLink message marshaling library"
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=54ad3cbe91bebcf6b1823970ff1fb97f"
 
+DEPENDS = "${PYTHON_PN}-setuptools-native ${PYTHON_PN}-future-native"
+
 SRC_URI = "git://github.com/mavlink/mavlink-gbp-release.git;branch=release/kinetic/mavlink"
 SRCREV = "release/kinetic/mavlink/2017.8.8-0"
 
@@ -10,6 +12,4 @@ SRC_URI += "file://0002-provide-path-to-find-mavgen_c.patch"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "${PYTHON_PN}-setuptools-native ${PYTHON_PN}-future-native"
-
 inherit catkin

recipes-ros/moveit-msgs/moveit-msgs_0.7.5.bb

@@ -12,5 +12,3 @@ SRC_URI[sha256sum] = "170b74b99c54fcf0334df2c4b0ecef84007d3bc0be7f9c530e69edf391
 S = "${WORKDIR}/${ROS_SP}"
 
 inherit catkin
-
-ROS_SPN = "moveit_msgs"

recipes-ros/object-recognition-msgs/object-recognition-msgs_0.4.1.bb

@@ -3,6 +3,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
 
+DEPENDS = "message-generation std-msgs geometry-msgs sensor-msgs actionlib-msgs shape-msgs"
+
 SRC_URI = "https://github.com/wg-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "c79731da116912ae8b1366aa705345ab"
 SRC_URI[sha256sum] = "b7689a079ad78a4358946fa5a38de0c9a5c12e46381d22106f053ac5cde357f1"
@@ -10,7 +12,3 @@ SRC_URI[sha256sum] = "b7689a079ad78a4358946fa5a38de0c9a5c12e46381d22106f053ac5cd
 S = "${WORKDIR}/${ROS_SP}"
 
 inherit catkin
-
-ROS_SPN = "object_recognition_msgs"
-
-DEPENDS = "message-generation std-msgs geometry-msgs sensor-msgs actionlib-msgs shape-msgs"

recipes-ros/octomap/octomap_1.8.0.bb

@@ -11,8 +11,6 @@ SRC_URI[sha256sum] = "158f66af55bb660a2aa7d0a00c60c9e5320f6594bd0924748af1471d31
 
 S = "${WORKDIR}/${BP}/${BPN}"
 
-EXTRA_OECMAKE += "\
+EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON"
-    -DCMAKE_SKIP_RPATH=ON \
-"
 
 inherit cmake