From 3c9a9fe2d3e5ec7aebc2244d73ddbf6cac738e8c Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 19:41:46 +0200 Subject: [PATCH 01/10] moveit: tune and harmonize filename --- recipes-ros/moveit/moveit-core_0.7.8.bb | 2 +- recipes-ros/moveit/moveit-ros-perception_0.7.8.bb | 9 ++++----- recipes-ros/moveit/moveit-ros-planning_0.7.8.bb | 7 +++---- recipes-ros/moveit/{moveit-0.7.8.inc => moveit.inc} | 0 4 files changed, 8 insertions(+), 10 deletions(-) rename recipes-ros/moveit/{moveit-0.7.8.inc => moveit.inc} (100%) diff --git a/recipes-ros/moveit/moveit-core_0.7.8.bb b/recipes-ros/moveit/moveit-core_0.7.8.bb index 2ab6d36..6f63c68 100644 --- a/recipes-ros/moveit/moveit-core_0.7.8.bb +++ b/recipes-ros/moveit/moveit-core_0.7.8.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de DEPENDS = "roslib boost eigen-conversions fcl octomap eigen-stl-containers geometric-shapes kdl-parser moveit-msgs srdfdom cmake-modules" -require moveit-${PV}.inc +require moveit.inc diff --git a/recipes-ros/moveit/moveit-ros-perception_0.7.8.bb b/recipes-ros/moveit/moveit-ros-perception_0.7.8.bb index 4c6d68e..c25c625 100644 --- a/recipes-ros/moveit/moveit-ros-perception_0.7.8.bb +++ b/recipes-ros/moveit/moveit-ros-perception_0.7.8.bb @@ -3,15 +3,14 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5" - DEPENDS = "moveit-core tf-conversions image-transport cv-bridge" -require moveit-${PV}.inc +require moveit.inc ROS_BPN = "moveit_ros/perception" -SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz \ - file://0001-moveit_ros_perception-make-OpenGL-parts-optional.patch \ - file://0002-Add-C-11-support-for-moveit_ros_perception-and-movei.patch \ +SRC_URI += "file://0001-moveit_ros_perception-make-OpenGL-parts-optional.patch \ + file://0002-Add-C-11-support-for-moveit_ros_perception-and-movei.patch \ " + EXTRA_OECMAKE_append = " -DBUILD_OPENGL=OFF" diff --git a/recipes-ros/moveit/moveit-ros-planning_0.7.8.bb b/recipes-ros/moveit/moveit-ros-planning_0.7.8.bb index e51eab5..40e9f16 100644 --- a/recipes-ros/moveit/moveit-ros-planning_0.7.8.bb +++ b/recipes-ros/moveit/moveit-ros-planning_0.7.8.bb @@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9de DEPENDS = "moveit-core moveit-ros-perception dynamic-reconfigure ${PYTHON_PN}-rospkg libtinyxml" -require moveit-${PV}.inc +require moveit.inc ROS_BPN = "moveit_ros/planning" -SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz \ - file://0001-address-gcc6-build-error.patch \ - " +SRC_URI += "file://0001-address-gcc6-build-error.patch" + FILES_${PN} += "${ros_libdir}/moveit_ros_planning/*" diff --git a/recipes-ros/moveit/moveit-0.7.8.inc b/recipes-ros/moveit/moveit.inc similarity index 100% rename from recipes-ros/moveit/moveit-0.7.8.inc rename to recipes-ros/moveit/moveit.inc From 2f2954fb8279651a58868bd8df39002a98ee70a7 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:35 +0200 Subject: [PATCH 02/10] actionlib: updating to 1.11.9 --- .../actionlib/{actionlib_1.11.7.bb => actionlib_1.11.9.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/actionlib/{actionlib_1.11.7.bb => actionlib_1.11.9.bb} (73%) diff --git a/recipes-ros/actionlib/actionlib_1.11.7.bb b/recipes-ros/actionlib/actionlib_1.11.9.bb similarity index 73% rename from recipes-ros/actionlib/actionlib_1.11.7.bb rename to recipes-ros/actionlib/actionlib_1.11.9.bb index ae1906b..03c07c2 100644 --- a/recipes-ros/actionlib/actionlib_1.11.7.bb +++ b/recipes-ros/actionlib/actionlib_1.11.9.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9de DEPENDS = "actionlib-msgs roscpp" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "27f247adad8441c2ac2316cfc4ce4427" -SRC_URI[sha256sum] = "e849e30363b7df0a92ec9179b9ff9833a72581003da9eb880fc3e21ef1f4667e" +SRC_URI[md5sum] = "55232c305dcadd9b265e512dc61edd9c" +SRC_URI[sha256sum] = "0e0eb18e964cfd25490875295950760fb468fd30cab707c0138ddada131be7c6" inherit catkin From 58463f316dc26ff2e82ad90d50453207d5b3131d Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:34 +0200 Subject: [PATCH 03/10] bond-core: updating to 1.7.19 --- recipes-ros/bond-core/bond-core.inc | 4 ++-- recipes-ros/bond-core/{bond_1.7.18.bb => bond_1.7.19.bb} | 0 .../bond-core/{bondcpp_1.7.18.bb => bondcpp_1.7.19.bb} | 0 recipes-ros/bond-core/{bondpy_1.7.18.bb => bondpy_1.7.19.bb} | 0 recipes-ros/bond-core/{smclib_1.7.18.bb => smclib_1.7.19.bb} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/bond-core/{bond_1.7.18.bb => bond_1.7.19.bb} (100%) rename recipes-ros/bond-core/{bondcpp_1.7.18.bb => bondcpp_1.7.19.bb} (100%) rename recipes-ros/bond-core/{bondpy_1.7.18.bb => bondpy_1.7.19.bb} (100%) rename recipes-ros/bond-core/{smclib_1.7.18.bb => smclib_1.7.19.bb} (100%) diff --git a/recipes-ros/bond-core/bond-core.inc b/recipes-ros/bond-core/bond-core.inc index 6ceeb9c..077d226 100644 --- a/recipes-ros/bond-core/bond-core.inc +++ b/recipes-ros/bond-core/bond-core.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "7832ec9a9e467e60747a886361624fb7" -SRC_URI[sha256sum] = "cdcad6a9a311bbe2f8f05ece55f595c0443b3a99e1c9ebd7b1c50ff05d6de123" +SRC_URI[md5sum] = "3afd0058ae7bc2868a5d086f7737465a" +SRC_URI[sha256sum] = "67d7f1cbfe1a007ba48aa477f722e185485006cbd0abdd1460f580d677f89643" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/bond-core/bond_1.7.18.bb b/recipes-ros/bond-core/bond_1.7.19.bb similarity index 100% rename from recipes-ros/bond-core/bond_1.7.18.bb rename to recipes-ros/bond-core/bond_1.7.19.bb diff --git a/recipes-ros/bond-core/bondcpp_1.7.18.bb b/recipes-ros/bond-core/bondcpp_1.7.19.bb similarity index 100% rename from recipes-ros/bond-core/bondcpp_1.7.18.bb rename to recipes-ros/bond-core/bondcpp_1.7.19.bb diff --git a/recipes-ros/bond-core/bondpy_1.7.18.bb b/recipes-ros/bond-core/bondpy_1.7.19.bb similarity index 100% rename from recipes-ros/bond-core/bondpy_1.7.18.bb rename to recipes-ros/bond-core/bondpy_1.7.19.bb diff --git a/recipes-ros/bond-core/smclib_1.7.18.bb b/recipes-ros/bond-core/smclib_1.7.19.bb similarity index 100% rename from recipes-ros/bond-core/smclib_1.7.18.bb rename to recipes-ros/bond-core/smclib_1.7.19.bb From 1045a31402fab9558ac020c8cab1d71cffaedc3c Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:35 +0200 Subject: [PATCH 04/10] dynamic-reconfigure: updating to 1.5.48 --- ...ic-reconfigure_1.5.46.bb => dynamic-reconfigure_1.5.48.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/dynamic-reconfigure/{dynamic-reconfigure_1.5.46.bb => dynamic-reconfigure_1.5.48.bb} (78%) diff --git a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.46.bb b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.48.bb similarity index 78% rename from recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.46.bb rename to recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.48.bb index 499fc76..8b1bdc7 100644 --- a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.46.bb +++ b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.48.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc DEPENDS = "roscpp std-msgs roslib" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "200c2039d3d6e494e0b8aebd65f3bb5d" -SRC_URI[sha256sum] = "c3d782715f16c0ec3335e23d27ddb62f12eec3492e865003168c74bd212a6fbb" +SRC_URI[md5sum] = "f10a72f0c9cf1a8e7c6b8cccbbb6ca04" +SRC_URI[sha256sum] = "351b778ea8478faad7287e2c70219deb13114b4983cd09d6d5faa4825706664a" S = "${WORKDIR}/${ROS_SP}" From 6ccdb1738109cd5eeeeeeed5b0388db16e03519c Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:34 +0200 Subject: [PATCH 05/10] kdl-parser: updating to 1.11.13 --- .../robot-model/{kdl-parser_1.11.12.bb => kdl-parser_1.11.13.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-ros/robot-model/{kdl-parser_1.11.12.bb => kdl-parser_1.11.13.bb} (100%) diff --git a/recipes-ros/robot-model/kdl-parser_1.11.12.bb b/recipes-ros/robot-model/kdl-parser_1.11.13.bb similarity index 100% rename from recipes-ros/robot-model/kdl-parser_1.11.12.bb rename to recipes-ros/robot-model/kdl-parser_1.11.13.bb From 71c24b3473d7e2ef7b3c03a9b9307aeec5cd7534 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:34 +0200 Subject: [PATCH 06/10] moveit: updating to 0.7.9 Due to the update, this commit also drops the patch that has been accepted upstream. Signed-off-by: Lukas Bulwahn --- ...eit-core_0.7.8.bb => moveit-core_0.7.9.bb} | 0 ....7.8.bb => moveit-ros-perception_0.7.9.bb} | 0 .../0001-address-gcc6-build-error.patch | 49 ------------------- ..._0.7.8.bb => moveit-ros-planning_0.7.9.bb} | 2 - recipes-ros/moveit/moveit.inc | 4 +- 5 files changed, 2 insertions(+), 53 deletions(-) rename recipes-ros/moveit/{moveit-core_0.7.8.bb => moveit-core_0.7.9.bb} (100%) rename recipes-ros/moveit/{moveit-ros-perception_0.7.8.bb => moveit-ros-perception_0.7.9.bb} (100%) delete mode 100644 recipes-ros/moveit/moveit-ros-planning/0001-address-gcc6-build-error.patch rename recipes-ros/moveit/{moveit-ros-planning_0.7.8.bb => moveit-ros-planning_0.7.9.bb} (87%) diff --git a/recipes-ros/moveit/moveit-core_0.7.8.bb b/recipes-ros/moveit/moveit-core_0.7.9.bb similarity index 100% rename from recipes-ros/moveit/moveit-core_0.7.8.bb rename to recipes-ros/moveit/moveit-core_0.7.9.bb diff --git a/recipes-ros/moveit/moveit-ros-perception_0.7.8.bb b/recipes-ros/moveit/moveit-ros-perception_0.7.9.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-perception_0.7.8.bb rename to recipes-ros/moveit/moveit-ros-perception_0.7.9.bb diff --git a/recipes-ros/moveit/moveit-ros-planning/0001-address-gcc6-build-error.patch b/recipes-ros/moveit/moveit-ros-planning/0001-address-gcc6-build-error.patch deleted file mode 100644 index 799d8e5..0000000 --- a/recipes-ros/moveit/moveit-ros-planning/0001-address-gcc6-build-error.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6734257c8d611e7561372be93e31ea5c4887c7e2 Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov -Date: Wed, 25 Jan 2017 11:02:22 +0200 -Subject: [PATCH 1/2] address gcc6 build error - -With gcc6, compiling fails with `stdlib.h: No such file or directory`, -as including '-isystem /usr/include' breaks with gcc6, cf., -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129. - -This commit addresses this issue for this package in almost the same way -it was addressed in various other ROS packages. A list of related -commits and pull requests is at: - - https://github.com/ros/rosdistro/issues/12783 - -Particularly when searching for the Boost library CMake sets -Boost_INCLUDE_DIRS to @SYSROOT@/usr/include which should be -avoided in the `-isystem` option of gcc. - -Upstream-Status: Accepted - -Signed-off-by: Dmitry Rozhkov ---- - CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f41991..4829da0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,11 +62,12 @@ catkin_package( - - include_directories(${THIS_PACKAGE_INCLUDE_DIRS} - ${catkin_INCLUDE_DIRS} -- ) -+ ${Boost_INCLUDE_DIRS} -+) - include_directories(SYSTEM - ${EIGEN_INCLUDE_DIRS} -- ${Boost_INCLUDE_DIRS} -- ) -+) -+ - - link_directories(${Boost_LIBRARY_DIRS}) - link_directories(${catkin_LIBRARY_DIRS}) --- -2.7.4 - diff --git a/recipes-ros/moveit/moveit-ros-planning_0.7.8.bb b/recipes-ros/moveit/moveit-ros-planning_0.7.9.bb similarity index 87% rename from recipes-ros/moveit/moveit-ros-planning_0.7.8.bb rename to recipes-ros/moveit/moveit-ros-planning_0.7.9.bb index 40e9f16..890969d 100644 --- a/recipes-ros/moveit/moveit-ros-planning_0.7.8.bb +++ b/recipes-ros/moveit/moveit-ros-planning_0.7.9.bb @@ -9,6 +9,4 @@ require moveit.inc ROS_BPN = "moveit_ros/planning" -SRC_URI += "file://0001-address-gcc6-build-error.patch" - FILES_${PN} += "${ros_libdir}/moveit_ros_planning/*" diff --git a/recipes-ros/moveit/moveit.inc b/recipes-ros/moveit/moveit.inc index b8ac34d..00572f8 100644 --- a/recipes-ros/moveit/moveit.inc +++ b/recipes-ros/moveit/moveit.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "fadd453134bb64559b989d2b3f02ca28" -SRC_URI[sha256sum] = "d14103ddf4545f42acaabfcdda36eeff9a293e07269d339eeb7ac4ab6dd3c522" +SRC_URI[md5sum] = "6ebfe9fc33837fcea079bcd7f3741eb5" +SRC_URI[sha256sum] = "9ec381e6589a663b03f8468d095599b90b14e102be221f9b19dc8b833dbc05bb" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" From daef0bb4c6b08d4efc36d8842bf20da2284677cc Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:35 +0200 Subject: [PATCH 07/10] nodelet-core: updating to 1.9.10 --- recipes-ros/nodelet-core/nodelet-core.inc | 4 ++-- ...let-topic-tools_1.9.8.bb => nodelet-topic-tools_1.9.10.bb} | 0 .../nodelet-core/{nodelet_1.9.8.bb => nodelet_1.9.10.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/nodelet-core/{nodelet-topic-tools_1.9.8.bb => nodelet-topic-tools_1.9.10.bb} (100%) rename recipes-ros/nodelet-core/{nodelet_1.9.8.bb => nodelet_1.9.10.bb} (100%) diff --git a/recipes-ros/nodelet-core/nodelet-core.inc b/recipes-ros/nodelet-core/nodelet-core.inc index 080d350..4a0cf58 100644 --- a/recipes-ros/nodelet-core/nodelet-core.inc +++ b/recipes-ros/nodelet-core/nodelet-core.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "fd356be7e92f3425fc426209a928ad4a" -SRC_URI[sha256sum] = "65181dfe8070c9cd7ed2d16a9cb0204f2ab122fd3f960c4042a5cbf5566f6ede" +SRC_URI[md5sum] = "b453b5d5bb06ebfca393d9e8e3c845e2" +SRC_URI[sha256sum] = "50b8b3c01b577c8d71c92ec64ae516e030e2912bc5afcf66b2ada8bc39002544" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/nodelet-core/nodelet-topic-tools_1.9.8.bb b/recipes-ros/nodelet-core/nodelet-topic-tools_1.9.10.bb similarity index 100% rename from recipes-ros/nodelet-core/nodelet-topic-tools_1.9.8.bb rename to recipes-ros/nodelet-core/nodelet-topic-tools_1.9.10.bb diff --git a/recipes-ros/nodelet-core/nodelet_1.9.8.bb b/recipes-ros/nodelet-core/nodelet_1.9.10.bb similarity index 100% rename from recipes-ros/nodelet-core/nodelet_1.9.8.bb rename to recipes-ros/nodelet-core/nodelet_1.9.10.bb From 6c2074751738df7f7bcff241e71a92f183dcd963 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:35 +0200 Subject: [PATCH 08/10] pluginlib: updating to 1.10.5 --- .../pluginlib/{pluginlib_1.10.4.bb => pluginlib_1.10.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/pluginlib/{pluginlib_1.10.4.bb => pluginlib_1.10.5.bb} (76%) diff --git a/recipes-ros/pluginlib/pluginlib_1.10.4.bb b/recipes-ros/pluginlib/pluginlib_1.10.5.bb similarity index 76% rename from recipes-ros/pluginlib/pluginlib_1.10.4.bb rename to recipes-ros/pluginlib/pluginlib_1.10.5.bb index 40d26b0..e9bf159 100644 --- a/recipes-ros/pluginlib/pluginlib_1.10.4.bb +++ b/recipes-ros/pluginlib/pluginlib_1.10.5.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc DEPENDS = "boost class-loader rosconsole roslib libtinyxml" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "60b02ed04b105e1fee0c536fe4612183" -SRC_URI[sha256sum] = "9a8a81d39472bda8cc8a9b189b9dc8f602b13b97a132a153144785d9fc5b68b2" +SRC_URI[md5sum] = "eb443817a26dc03b7c063e9bbb82439f" +SRC_URI[sha256sum] = "53a0ccb7a4654d464271189fc44ba23d6be8d3ecdfb40506b9d9fb4a87f19d6c" inherit catkin From 08d59490ebad0be5a8198741747acb13bfaeebcd Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:34 +0200 Subject: [PATCH 09/10] resource-retriever: updating to 1.11.8 --- ...rce-retriever_1.11.7.bb => resource-retriever_1.11.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-ros/resource-retriever/{resource-retriever_1.11.7.bb => resource-retriever_1.11.8.bb} (71%) diff --git a/recipes-ros/resource-retriever/resource-retriever_1.11.7.bb b/recipes-ros/resource-retriever/resource-retriever_1.11.8.bb similarity index 71% rename from recipes-ros/resource-retriever/resource-retriever_1.11.7.bb rename to recipes-ros/resource-retriever/resource-retriever_1.11.8.bb index 94e49ea..afb3e1f 100644 --- a/recipes-ros/resource-retriever/resource-retriever_1.11.7.bb +++ b/recipes-ros/resource-retriever/resource-retriever_1.11.8.bb @@ -2,15 +2,15 @@ DESCRIPTION = "This package retrieves data from url-format files such as \ http://, ftp://, package:// file://, etc., and loads the data into memory." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=18;endline=18;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "curl rosconsole roslib" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz \ file://0001-Python3-compatibility-10.patch \ " -SRC_URI[md5sum] = "1dffd39475ebe70b14390889d3b4b3c4" -SRC_URI[sha256sum] = "5f00e95c5a086973efa25e26da9cee8f4b10b446fbb5eb6694b32b2201539866" +SRC_URI[md5sum] = "cd1055502daeaf93985fb56327c419f4" +SRC_URI[sha256sum] = "db3ce752736123499d80d803526080e31f2ba21460fd135186b26bf7b72fed2a" S = "${WORKDIR}/${ROS_SP}" From 55a8df60fa35e5046c542fad7974b933e03c1b91 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 13 Apr 2017 20:07:34 +0200 Subject: [PATCH 10/10] robot-model: updating to 1.11.13 The commit adjusts the line number of the license check due to the update. Due to the manual inspection, this commit also tunes the description to a short description. Signed-off-by: Lukas Bulwahn --- .../{collada-parser_1.11.12.bb => collada-parser_1.11.13.bb} | 0 .../{collada-urdf_1.11.12.bb => collada-urdf_1.11.13.bb} | 0 ...-publisher_1.11.12.bb => joint-state-publisher_1.11.13.bb} | 0 recipes-ros/robot-model/kdl-parser_1.11.13.bb | 4 ++-- recipes-ros/robot-model/robot-model.inc | 4 ++-- ...parser-plugin_1.11.12.bb => urdf-parser-plugin_1.11.13.bb} | 2 +- recipes-ros/robot-model/{urdf_1.11.12.bb => urdf_1.11.13.bb} | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) rename recipes-ros/robot-model/{collada-parser_1.11.12.bb => collada-parser_1.11.13.bb} (100%) rename recipes-ros/robot-model/{collada-urdf_1.11.12.bb => collada-urdf_1.11.13.bb} (100%) rename recipes-ros/robot-model/{joint-state-publisher_1.11.12.bb => joint-state-publisher_1.11.13.bb} (100%) rename recipes-ros/robot-model/{urdf-parser-plugin_1.11.12.bb => urdf-parser-plugin_1.11.13.bb} (75%) rename recipes-ros/robot-model/{urdf_1.11.12.bb => urdf_1.11.13.bb} (51%) diff --git a/recipes-ros/robot-model/collada-parser_1.11.12.bb b/recipes-ros/robot-model/collada-parser_1.11.13.bb similarity index 100% rename from recipes-ros/robot-model/collada-parser_1.11.12.bb rename to recipes-ros/robot-model/collada-parser_1.11.13.bb diff --git a/recipes-ros/robot-model/collada-urdf_1.11.12.bb b/recipes-ros/robot-model/collada-urdf_1.11.13.bb similarity index 100% rename from recipes-ros/robot-model/collada-urdf_1.11.12.bb rename to recipes-ros/robot-model/collada-urdf_1.11.13.bb diff --git a/recipes-ros/robot-model/joint-state-publisher_1.11.12.bb b/recipes-ros/robot-model/joint-state-publisher_1.11.13.bb similarity index 100% rename from recipes-ros/robot-model/joint-state-publisher_1.11.12.bb rename to recipes-ros/robot-model/joint-state-publisher_1.11.13.bb diff --git a/recipes-ros/robot-model/kdl-parser_1.11.13.bb b/recipes-ros/robot-model/kdl-parser_1.11.13.bb index 28d74db..2cf97ad 100644 --- a/recipes-ros/robot-model/kdl-parser_1.11.13.bb +++ b/recipes-ros/robot-model/kdl-parser_1.11.13.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "The Kinematics and Dynamics Library (KDL) defines a tree structure to represent the kinematic and dynamic parameters of a robot mechanism. kdl_parser provides tools to construct a KDL tree from an XML robot representation in URDF." +DESCRIPTION = "kdl_parser provides tools to construct a KDL tree from an XML robot representation in URDF." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=17;endline=17;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "libeigen orocos-kdl rosconsole roscpp urdf cmake-modules" diff --git a/recipes-ros/robot-model/robot-model.inc b/recipes-ros/robot-model/robot-model.inc index d75e420..36ed9e8 100644 --- a/recipes-ros/robot-model/robot-model.inc +++ b/recipes-ros/robot-model/robot-model.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "feb4e2d49ba8e4607524d4e91aeec4c9" -SRC_URI[sha256sum] = "6313abe64e29fbbe87d8e108c13ccd075de4ff8f01b85f988716b9475d312112" +SRC_URI[md5sum] = "5867e22cea9db638689102a544010974" +SRC_URI[sha256sum] = "da70be8a4d70737880c98402cc5beee008e617e1e60e46b2b59d598376525c48" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/robot-model/urdf-parser-plugin_1.11.12.bb b/recipes-ros/robot-model/urdf-parser-plugin_1.11.13.bb similarity index 75% rename from recipes-ros/robot-model/urdf-parser-plugin_1.11.12.bb rename to recipes-ros/robot-model/urdf-parser-plugin_1.11.13.bb index 09ef961..d5e84ea 100644 --- a/recipes-ros/robot-model/urdf-parser-plugin_1.11.12.bb +++ b/recipes-ros/robot-model/urdf-parser-plugin_1.11.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "This package contains a C++ base class for URDF parsers" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "urdfdom-headers" diff --git a/recipes-ros/robot-model/urdf_1.11.12.bb b/recipes-ros/robot-model/urdf_1.11.13.bb similarity index 51% rename from recipes-ros/robot-model/urdf_1.11.12.bb rename to recipes-ros/robot-model/urdf_1.11.13.bb index 99d6b5a..b87dcd5 100644 --- a/recipes-ros/robot-model/urdf_1.11.12.bb +++ b/recipes-ros/robot-model/urdf_1.11.13.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "This package contains a C++ parser for the Unified Robot Description Format (URDF), which is an XML format for representing a robot model. The code API of the parser has been through our review process and will remain backwards compatible in future releases." +DESCRIPTION = "This package contains a C++ parser for the Unified Robot Description Format (URDF)" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "rosconsole-bridge roscpp urdfdom-headers urdf-parser-plugin pluginlib urdfdom cmake-modules libtinyxml class-loader"