From 95b86cde24d758aeb58b2ee0ef57e4601a6fa32e Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 11:15:54 +0100 Subject: [PATCH 1/9] actionlib: updating to 1.11.12 --- .../actionlib/{actionlib_1.11.9.bb => actionlib_1.11.12.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-ros/actionlib/{actionlib_1.11.9.bb => actionlib_1.11.12.bb} (62%) diff --git a/recipes-ros/actionlib/actionlib_1.11.9.bb b/recipes-ros/actionlib/actionlib_1.11.12.bb similarity index 62% rename from recipes-ros/actionlib/actionlib_1.11.9.bb rename to recipes-ros/actionlib/actionlib_1.11.12.bb index 03c07c2..f045b8e 100644 --- a/recipes-ros/actionlib/actionlib_1.11.9.bb +++ b/recipes-ros/actionlib/actionlib_1.11.12.bb @@ -2,12 +2,12 @@ DESCRIPTION = "The actionlib stack provides a standardized interface for interfa preemptable tasks." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "actionlib-msgs roscpp" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "55232c305dcadd9b265e512dc61edd9c" -SRC_URI[sha256sum] = "0e0eb18e964cfd25490875295950760fb468fd30cab707c0138ddada131be7c6" +SRC_URI[md5sum] = "f75eaec35fe5cc29c4af308afc34e29a" +SRC_URI[sha256sum] = "e600f0b3f15ab41992adb7e5e95b89a8df6b679c4eb4b7c0771bdb74ed4da623" inherit catkin From 22427d3d0a79a965b6d5a2708a38019a969a3aec Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 11:15:54 +0100 Subject: [PATCH 2/9] bond-core: updating to 1.7.20 --- recipes-ros/bond-core/bond-core.inc | 4 ++-- recipes-ros/bond-core/{bond_1.7.19.bb => bond_1.7.20.bb} | 2 +- .../bond-core/{bondcpp_1.7.19.bb => bondcpp_1.7.20.bb} | 2 +- recipes-ros/bond-core/{bondpy_1.7.19.bb => bondpy_1.7.20.bb} | 2 +- recipes-ros/bond-core/{smclib_1.7.19.bb => smclib_1.7.20.bb} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename recipes-ros/bond-core/{bond_1.7.19.bb => bond_1.7.20.bb} (85%) rename recipes-ros/bond-core/{bondcpp_1.7.19.bb => bondcpp_1.7.20.bb} (79%) rename recipes-ros/bond-core/{bondpy_1.7.19.bb => bondpy_1.7.20.bb} (78%) rename recipes-ros/bond-core/{smclib_1.7.19.bb => smclib_1.7.20.bb} (87%) diff --git a/recipes-ros/bond-core/bond-core.inc b/recipes-ros/bond-core/bond-core.inc index 077d226..df006f8 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] = "3afd0058ae7bc2868a5d086f7737465a" -SRC_URI[sha256sum] = "67d7f1cbfe1a007ba48aa477f722e185485006cbd0abdd1460f580d677f89643" +SRC_URI[md5sum] = "1c008e362a2b9eee5b5a57e46452b9cf" +SRC_URI[sha256sum] = "44b6455ebc6406b9d2ced5efe590bcbf22cf3fe3107d363409d0262aaa21ebb9" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/bond-core/bond_1.7.19.bb b/recipes-ros/bond-core/bond_1.7.20.bb similarity index 85% rename from recipes-ros/bond-core/bond_1.7.19.bb rename to recipes-ros/bond-core/bond_1.7.20.bb index 629fc7d..ec75c82 100644 --- a/recipes-ros/bond-core/bond_1.7.19.bb +++ b/recipes-ros/bond-core/bond_1.7.20.bb @@ -6,7 +6,7 @@ heartbeat times out.\ " 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 = "message-generation std-msgs roscpp-serialization" diff --git a/recipes-ros/bond-core/bondcpp_1.7.19.bb b/recipes-ros/bond-core/bondcpp_1.7.20.bb similarity index 79% rename from recipes-ros/bond-core/bondcpp_1.7.19.bb rename to recipes-ros/bond-core/bondcpp_1.7.20.bb index 743245a..d8fb7d7 100644 --- a/recipes-ros/bond-core/bondcpp_1.7.19.bb +++ b/recipes-ros/bond-core/bondcpp_1.7.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "C++ implementation of bond, a mechanism for checking when another process has terminated." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "bond boost cmake-modules roscpp smclib" diff --git a/recipes-ros/bond-core/bondpy_1.7.19.bb b/recipes-ros/bond-core/bondpy_1.7.20.bb similarity index 78% rename from recipes-ros/bond-core/bondpy_1.7.19.bb rename to recipes-ros/bond-core/bondpy_1.7.20.bb index 96c83b6..e15513b 100644 --- a/recipes-ros/bond-core/bondpy_1.7.19.bb +++ b/recipes-ros/bond-core/bondpy_1.7.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python implementation of bond, a mechanism for checking when another process has terminated." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "bond rospy smclib" diff --git a/recipes-ros/bond-core/smclib_1.7.19.bb b/recipes-ros/bond-core/smclib_1.7.20.bb similarity index 87% rename from recipes-ros/bond-core/smclib_1.7.19.bb rename to recipes-ros/bond-core/smclib_1.7.20.bb index c083886..75b026b 100644 --- a/recipes-ros/bond-core/smclib_1.7.19.bb +++ b/recipes-ros/bond-core/smclib_1.7.20.bb @@ -7,6 +7,6 @@ depends on, but it does not contain the compiler itself. \ " SECTION = "devel" LICENSE = "MPL-1.1" -LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=e1b5a50d4dd59d8102e41a7a2254462d" +LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=e1b5a50d4dd59d8102e41a7a2254462d" require bond-core.inc From 3a7b29ba7f719978a6f7f835250285db1d3577e8 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 11:15:54 +0100 Subject: [PATCH 3/9] class-loader: updating to 0.3.8 --- .../{class-loader_0.3.6.bb => class-loader_0.3.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-ros/class-loader/{class-loader_0.3.6.bb => class-loader_0.3.8.bb} (74%) diff --git a/recipes-ros/class-loader/class-loader_0.3.6.bb b/recipes-ros/class-loader/class-loader_0.3.8.bb similarity index 74% rename from recipes-ros/class-loader/class-loader_0.3.6.bb rename to recipes-ros/class-loader/class-loader_0.3.8.bb index 40bb581..1a39f45 100644 --- a/recipes-ros/class-loader/class-loader_0.3.6.bb +++ b/recipes-ros/class-loader/class-loader_0.3.8.bb @@ -6,13 +6,13 @@ plugin classes, and allows users to instantiate objects of said exported \ classes without the explicit declaration (i.e. header file) for those classes." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "cmake-modules console-bridge poco" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "faa7b419ba0ea1714f71404c2e76af0a" -SRC_URI[sha256sum] = "4413ea6492bc75a197fa2f219f59e46f70a33dc740aef0fba4f583c3de7bbbc3" +SRC_URI[md5sum] = "3684301f5f1e8c901391e929564b9743" +SRC_URI[sha256sum] = "fb58efe5ec10597770d32f67093976d1522b0e09dfa1b2b9ba1191081421ba49" S = "${WORKDIR}/${ROS_SP}" From 090f7fbc007ce7277c88e404c05279a02d7c47eb Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 11:15:54 +0100 Subject: [PATCH 4/9] geometric-shapes: updating to 0.4.6 --- .../{geometric-shapes_0.4.5.bb => geometric-shapes_0.4.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/geometric-shapes/{geometric-shapes_0.4.5.bb => geometric-shapes_0.4.6.bb} (78%) diff --git a/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb b/recipes-ros/geometric-shapes/geometric-shapes_0.4.6.bb similarity index 78% rename from recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb rename to recipes-ros/geometric-shapes/geometric-shapes_0.4.6.bb index 3b719af..6380efa 100644 --- a/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb +++ b/recipes-ros/geometric-shapes/geometric-shapes_0.4.6.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=5ee5b8b046ae4 DEPENDS = "boost shape-msgs octomap assimp libeigen qhull console-bridge random-numbers eigen-stl-containers resource-retriever visualization-msgs" SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "2a11cd903e581f4e9cef57551e3f284b" -SRC_URI[sha256sum] = "dc3e826930642d6a2e47e8847550c680d03649fa90ca521fa752ff01bd3b697c" +SRC_URI[md5sum] = "9f125d76fb143f4206f2618f40f15d40" +SRC_URI[sha256sum] = "8998d5b4f23d4819ad92c2d37233cbd2dafe2480d689bffdbc666ed8e5c5aefa" S = "${WORKDIR}/${ROS_SP}" From 7830e48b87430c64c5d6239e156b2cd23873b73d Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 11:15:54 +0100 Subject: [PATCH 5/9] navigation: updating to 1.12.14 This commit also drops patches included in version 1.12.14 and adjusts to new enforced dependencies in the move_base package. Signed-off-by: Lukas Bulwahn --- .../{amcl_1.12.13.bb => amcl_1.12.14.bb} | 0 ...CMakeLists-optional-ros-rosdistro-30.patch | 35 ---------- ...12.13.bb => base-local-planner_1.12.14.bb} | 2 - ...r_1.12.13.bb => carrot-planner_1.12.14.bb} | 0 ...3.bb => clear-costmap-recovery_1.12.14.bb} | 0 ...ap-2d_1.12.13.bb => costmap-2d_1.12.14.bb} | 0 ....12.13.bb => dwa-local-planner_1.12.14.bb} | 0 ....12.13.bb => fake-localization_1.12.14.bb} | 0 .../files/0001-address-gcc6-build-error.patch | 69 ------------------- ...r_1.12.13.bb => global-planner_1.12.14.bb} | 0 ...erver_1.12.13.bb => map-server_1.12.14.bb} | 0 ...s_1.12.13.bb => move-base-msgs_1.12.14.bb} | 0 ...e-base_1.12.13.bb => move-base_1.12.14.bb} | 5 +- ...2.13.bb => move-slow-and-clear_1.12.14.bb} | 0 ...av-core_1.12.13.bb => nav-core_1.12.14.bb} | 0 .../{navfn_1.12.13.bb => navfn_1.12.14.bb} | 0 recipes-ros/navigation/navigation.inc | 7 +- ...f_1.12.13.bb => robot-pose-ekf_1.12.14.bb} | 0 ..._1.12.13.bb => rotate-recovery_1.12.14.bb} | 0 ...-grid_1.12.13.bb => voxel-grid_1.12.14.bb} | 0 20 files changed, 6 insertions(+), 112 deletions(-) rename recipes-ros/navigation/{amcl_1.12.13.bb => amcl_1.12.14.bb} (100%) delete mode 100644 recipes-ros/navigation/base-local-planner/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch rename recipes-ros/navigation/{base-local-planner_1.12.13.bb => base-local-planner_1.12.14.bb} (84%) rename recipes-ros/navigation/{carrot-planner_1.12.13.bb => carrot-planner_1.12.14.bb} (100%) rename recipes-ros/navigation/{clear-costmap-recovery_1.12.13.bb => clear-costmap-recovery_1.12.14.bb} (100%) rename recipes-ros/navigation/{costmap-2d_1.12.13.bb => costmap-2d_1.12.14.bb} (100%) rename recipes-ros/navigation/{dwa-local-planner_1.12.13.bb => dwa-local-planner_1.12.14.bb} (100%) rename recipes-ros/navigation/{fake-localization_1.12.13.bb => fake-localization_1.12.14.bb} (100%) delete mode 100644 recipes-ros/navigation/files/0001-address-gcc6-build-error.patch rename recipes-ros/navigation/{global-planner_1.12.13.bb => global-planner_1.12.14.bb} (100%) rename recipes-ros/navigation/{map-server_1.12.13.bb => map-server_1.12.14.bb} (100%) rename recipes-ros/navigation/{move-base-msgs_1.12.13.bb => move-base-msgs_1.12.14.bb} (100%) rename recipes-ros/navigation/{move-base_1.12.13.bb => move-base_1.12.14.bb} (55%) rename recipes-ros/navigation/{move-slow-and-clear_1.12.13.bb => move-slow-and-clear_1.12.14.bb} (100%) rename recipes-ros/navigation/{nav-core_1.12.13.bb => nav-core_1.12.14.bb} (100%) rename recipes-ros/navigation/{navfn_1.12.13.bb => navfn_1.12.14.bb} (100%) rename recipes-ros/navigation/{robot-pose-ekf_1.12.13.bb => robot-pose-ekf_1.12.14.bb} (100%) rename recipes-ros/navigation/{rotate-recovery_1.12.13.bb => rotate-recovery_1.12.14.bb} (100%) rename recipes-ros/navigation/{voxel-grid_1.12.13.bb => voxel-grid_1.12.14.bb} (100%) diff --git a/recipes-ros/navigation/amcl_1.12.13.bb b/recipes-ros/navigation/amcl_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/amcl_1.12.13.bb rename to recipes-ros/navigation/amcl_1.12.14.bb diff --git a/recipes-ros/navigation/base-local-planner/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/navigation/base-local-planner/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch deleted file mode 100644 index 7e4b8bd..0000000 --- a/recipes-ros/navigation/base-local-planner/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e6f3979ff8b988fe7992bf08a8267f1e11f58627 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Tue, 4 Apr 2017 14:39:25 +0200 -Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010) - -Upstream-Status: Submitted [https://github.com/ros-planning/navigation/pull/565] - -Signed-off-by: Lukas Bulwahn ---- - base_local_planner/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base_local_planner/CMakeLists.txt b/base_local_planner/CMakeLists.txt -index 2444ae1..507af18 100644 ---- a/base_local_planner/CMakeLists.txt -+++ b/base_local_planner/CMakeLists.txt -@@ -10,7 +10,6 @@ find_package(catkin REQUIRED - dynamic_reconfigure - nav_core - pcl_conversions -- rostest - costmap_2d - pluginlib - angles -@@ -129,6 +128,7 @@ install(DIRECTORY include/${PROJECT_NAME}/ - ) - - if(CATKIN_ENABLE_TESTING) -+ find_package(rostest) - catkin_add_gtest(base_local_planner_utest - test/gtest_main.cpp - test/utest.cpp --- -2.5.5 - diff --git a/recipes-ros/navigation/base-local-planner_1.12.13.bb b/recipes-ros/navigation/base-local-planner_1.12.14.bb similarity index 84% rename from recipes-ros/navigation/base-local-planner_1.12.13.bb rename to recipes-ros/navigation/base-local-planner_1.12.14.bb index 48c04f7..0f8b4e8 100644 --- a/recipes-ros/navigation/base-local-planner_1.12.13.bb +++ b/recipes-ros/navigation/base-local-planner_1.12.14.bb @@ -9,5 +9,3 @@ DEPENDS = "angles costmap-2d dynamic-reconfigure geometry-msgs libeigen message- voxel-grid visualization-msgs" require navigation.inc - -SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch;striplevel=2" diff --git a/recipes-ros/navigation/carrot-planner_1.12.13.bb b/recipes-ros/navigation/carrot-planner_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/carrot-planner_1.12.13.bb rename to recipes-ros/navigation/carrot-planner_1.12.14.bb diff --git a/recipes-ros/navigation/clear-costmap-recovery_1.12.13.bb b/recipes-ros/navigation/clear-costmap-recovery_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/clear-costmap-recovery_1.12.13.bb rename to recipes-ros/navigation/clear-costmap-recovery_1.12.14.bb diff --git a/recipes-ros/navigation/costmap-2d_1.12.13.bb b/recipes-ros/navigation/costmap-2d_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/costmap-2d_1.12.13.bb rename to recipes-ros/navigation/costmap-2d_1.12.14.bb diff --git a/recipes-ros/navigation/dwa-local-planner_1.12.13.bb b/recipes-ros/navigation/dwa-local-planner_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/dwa-local-planner_1.12.13.bb rename to recipes-ros/navigation/dwa-local-planner_1.12.14.bb diff --git a/recipes-ros/navigation/fake-localization_1.12.13.bb b/recipes-ros/navigation/fake-localization_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/fake-localization_1.12.13.bb rename to recipes-ros/navigation/fake-localization_1.12.14.bb diff --git a/recipes-ros/navigation/files/0001-address-gcc6-build-error.patch b/recipes-ros/navigation/files/0001-address-gcc6-build-error.patch deleted file mode 100644 index 3df8c76..0000000 --- a/recipes-ros/navigation/files/0001-address-gcc6-build-error.patch +++ /dev/null @@ -1,69 +0,0 @@ -From def48f89c985736901bb7bbe427f65acd18ef8d6 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Tue, 27 Sep 2016 15:25:19 +0200 -Subject: [PATCH] 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 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 - -The SYSTEM attribute for the eigen and pcl include directories -was added in commit 9e876d2b [1] on 2012-09-16 during the -package's transition to ROS Groovy. The reason for using -the SYSTEM attribute cannot be inferred from that commit. - -This attribute remained in the CMakeLists.txt during further -refinements in commits be4aebdb and 3a156140 on 2014-02-24, and -was not further touched until now. - -[1] https://github.com/ros-planning/navigation/commit/9e876d2b45aca2e2166ac5a508b0e7c7abc50717 -[2] https://github.com/ros-planning/navigation/commit/be4aebdb658381104b8e70f832091926e67ea0b4 -[3] https://github.com/ros-planning/navigation/commit/3a156140439ea2300aaad45f7f2a65dab503ff24 - -Signed-off-by: Lukas Bulwahn - -Upstream-Status: Pending [https://github.com/ros-planning/navigation/pull/522] - -Signed-off-by: Lukas Bulwahn ---- - move_slow_and_clear/CMakeLists.txt | 5 ++--- - navfn/CMakeLists.txt | 1 - - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/move_slow_and_clear/CMakeLists.txt b/move_slow_and_clear/CMakeLists.txt -index 078052d..686596e 100644 ---- a/move_slow_and_clear/CMakeLists.txt -+++ b/move_slow_and_clear/CMakeLists.txt -@@ -19,9 +19,8 @@ find_package(Boost REQUIRED COMPONENTS thread) - include_directories( - include - ${catkin_INCLUDE_DIRS} -- SYSTEM -- ${EIGEN_INCLUDE_DIRS} -- ${PCL_INCLUDE_DIRS} -+ ${EIGEN_INCLUDE_DIRS} -+ ${PCL_INCLUDE_DIRS} - ) - add_definitions(${EIGEN_DEFINITIONS}) - -diff --git a/navfn/CMakeLists.txt b/navfn/CMakeLists.txt -index ad01c3a..3e3995f 100644 ---- a/navfn/CMakeLists.txt -+++ b/navfn/CMakeLists.txt -@@ -21,7 +21,6 @@ find_package(PCL REQUIRED) - include_directories( - include - ${catkin_INCLUDE_DIRS} -- SYSTEM - ${EIGEN_INCLUDE_DIRS} - ${PCL_INCLUDE_DIRS} - ) --- -2.5.5 - diff --git a/recipes-ros/navigation/global-planner_1.12.13.bb b/recipes-ros/navigation/global-planner_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/global-planner_1.12.13.bb rename to recipes-ros/navigation/global-planner_1.12.14.bb diff --git a/recipes-ros/navigation/map-server_1.12.13.bb b/recipes-ros/navigation/map-server_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/map-server_1.12.13.bb rename to recipes-ros/navigation/map-server_1.12.14.bb diff --git a/recipes-ros/navigation/move-base-msgs_1.12.13.bb b/recipes-ros/navigation/move-base-msgs_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/move-base-msgs_1.12.13.bb rename to recipes-ros/navigation/move-base-msgs_1.12.14.bb diff --git a/recipes-ros/navigation/move-base_1.12.13.bb b/recipes-ros/navigation/move-base_1.12.14.bb similarity index 55% rename from recipes-ros/navigation/move-base_1.12.13.bb rename to recipes-ros/navigation/move-base_1.12.14.bb index 20b6605..cd7c162 100644 --- a/recipes-ros/navigation/move-base_1.12.13.bb +++ b/recipes-ros/navigation/move-base_1.12.14.bb @@ -4,7 +4,8 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=01c2bc31767ccb3a68e12f02612b2a97" -DEPENDS = "actionlib costmap-2d dynamic-reconfigure geometry-msgs message-generation move-base-msgs \ - nav-core nav-msgs pluginlib roscpp rospy std-msgs std-srvs tf visualization-msgs" +DEPENDS = "actionlib base-local-planner clear-costmap-recovery costmap-2d dynamic-reconfigure \ + geometry-msgs message-generation move-base-msgs nav-core navfn nav-msgs pluginlib roscpp \ + rospy rotate-recovery std-msgs std-srvs tf visualization-msgs" require navigation.inc diff --git a/recipes-ros/navigation/move-slow-and-clear_1.12.13.bb b/recipes-ros/navigation/move-slow-and-clear_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/move-slow-and-clear_1.12.13.bb rename to recipes-ros/navigation/move-slow-and-clear_1.12.14.bb diff --git a/recipes-ros/navigation/nav-core_1.12.13.bb b/recipes-ros/navigation/nav-core_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/nav-core_1.12.13.bb rename to recipes-ros/navigation/nav-core_1.12.14.bb diff --git a/recipes-ros/navigation/navfn_1.12.13.bb b/recipes-ros/navigation/navfn_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/navfn_1.12.13.bb rename to recipes-ros/navigation/navfn_1.12.14.bb diff --git a/recipes-ros/navigation/navigation.inc b/recipes-ros/navigation/navigation.inc index 6a88f53..570a1fe 100644 --- a/recipes-ros/navigation/navigation.inc +++ b/recipes-ros/navigation/navigation.inc @@ -1,9 +1,8 @@ SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "d7a392da183b3c2a5fce063e90cbf1f2" -SRC_URI[sha256sum] = "169f89a4a3a94437ffbf80a9b06b65471c17529169d1940a217e92d85481f18f" +SRC_URI[md5sum] = "25918a8c5e9b64a74ed7776fcd9419cd" +SRC_URI[sha256sum] = "0f98fae839023002769f4cbd770db87ad3ab9dd02faae7feda492fd38bda1407" -SRC_URI += "file://0001-address-gcc6-build-error.patch;patchdir=.. \ - file://0001-amcl-fix-compilation-with-gcc-v7.patch;patchdir=.." +SRC_URI += "file://0001-amcl-fix-compilation-with-gcc-v7.patch;patchdir=.." S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/navigation/robot-pose-ekf_1.12.13.bb b/recipes-ros/navigation/robot-pose-ekf_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/robot-pose-ekf_1.12.13.bb rename to recipes-ros/navigation/robot-pose-ekf_1.12.14.bb diff --git a/recipes-ros/navigation/rotate-recovery_1.12.13.bb b/recipes-ros/navigation/rotate-recovery_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/rotate-recovery_1.12.13.bb rename to recipes-ros/navigation/rotate-recovery_1.12.14.bb diff --git a/recipes-ros/navigation/voxel-grid_1.12.13.bb b/recipes-ros/navigation/voxel-grid_1.12.14.bb similarity index 100% rename from recipes-ros/navigation/voxel-grid_1.12.13.bb rename to recipes-ros/navigation/voxel-grid_1.12.14.bb From 4cc048e1d1b3f9be18bc95044025c22b3161c4a5 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 11:15:54 +0100 Subject: [PATCH 6/9] nodelet-core: updating to 1.9.14 --- recipes-ros/nodelet-core/nodelet-core.inc | 4 ++-- ...et-topic-tools_1.9.10.bb => nodelet-topic-tools_1.9.14.bb} | 2 +- .../nodelet-core/{nodelet_1.9.10.bb => nodelet_1.9.14.bb} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename recipes-ros/nodelet-core/{nodelet-topic-tools_1.9.10.bb => nodelet-topic-tools_1.9.14.bb} (67%) rename recipes-ros/nodelet-core/{nodelet_1.9.10.bb => nodelet_1.9.14.bb} (89%) diff --git a/recipes-ros/nodelet-core/nodelet-core.inc b/recipes-ros/nodelet-core/nodelet-core.inc index 4a0cf58..6d6fa1e 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] = "b453b5d5bb06ebfca393d9e8e3c845e2" -SRC_URI[sha256sum] = "50b8b3c01b577c8d71c92ec64ae516e030e2912bc5afcf66b2ada8bc39002544" +SRC_URI[md5sum] = "043c4455172d2ec9cfb87385aa71dedc" +SRC_URI[sha256sum] = "f41b124b769bde2a1dd603001e8e03b8310706780856fdb1660921dd66716be5" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/nodelet-core/nodelet-topic-tools_1.9.10.bb b/recipes-ros/nodelet-core/nodelet-topic-tools_1.9.14.bb similarity index 67% rename from recipes-ros/nodelet-core/nodelet-topic-tools_1.9.10.bb rename to recipes-ros/nodelet-core/nodelet-topic-tools_1.9.14.bb index 4e2ff72..da6191d 100644 --- a/recipes-ros/nodelet-core/nodelet-topic-tools_1.9.10.bb +++ b/recipes-ros/nodelet-core/nodelet-topic-tools_1.9.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "This package contains common nodelet tools such as a mux, demux and throttle." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "dynamic-reconfigure ${PYTHON_PN}-rospkg" diff --git a/recipes-ros/nodelet-core/nodelet_1.9.10.bb b/recipes-ros/nodelet-core/nodelet_1.9.14.bb similarity index 89% rename from recipes-ros/nodelet-core/nodelet_1.9.10.bb rename to recipes-ros/nodelet-core/nodelet_1.9.14.bb index da4e757..af3c7c3 100644 --- a/recipes-ros/nodelet-core/nodelet_1.9.10.bb +++ b/recipes-ros/nodelet-core/nodelet_1.9.14.bb @@ -8,7 +8,7 @@ for instantiating nodelets\ " SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "bondcpp boost message-generation pluginlib rosconsole roscpp rospy std-msgs libtinyxml" From 42c8d7b4bd84d0cf5ca81cb333a3ecda18dde379 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 11:15:54 +0100 Subject: [PATCH 7/9] pluginlib: updating to 1.10.6 --- .../pluginlib/{pluginlib_1.10.5.bb => pluginlib_1.10.6.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename recipes-ros/pluginlib/{pluginlib_1.10.5.bb => pluginlib_1.10.6.bb} (58%) diff --git a/recipes-ros/pluginlib/pluginlib_1.10.5.bb b/recipes-ros/pluginlib/pluginlib_1.10.6.bb similarity index 58% rename from recipes-ros/pluginlib/pluginlib_1.10.5.bb rename to recipes-ros/pluginlib/pluginlib_1.10.6.bb index e9bf159..7cf8753 100644 --- a/recipes-ros/pluginlib/pluginlib_1.10.5.bb +++ b/recipes-ros/pluginlib/pluginlib_1.10.6.bb @@ -2,12 +2,12 @@ DESCRIPTION = "The pluginlib package provides tools for writing and dynamically using the ROS build infrastructure." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" 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] = "eb443817a26dc03b7c063e9bbb82439f" -SRC_URI[sha256sum] = "53a0ccb7a4654d464271189fc44ba23d6be8d3ecdfb40506b9d9fb4a87f19d6c" +SRC_URI[md5sum] = "aa975b5a290de5e4fb2e86e234b686c0" +SRC_URI[sha256sum] = "af7ac0e0aa77b6b1ff2f781482fe30e31cafd1087b708d0f1c2a51176c585614" inherit catkin From 3d34bb30dca1d0440da1392d01b052132a44d42f Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 28 Dec 2017 19:50:33 +0100 Subject: [PATCH 8/9] amcl: update Upstream-Status of patch file --- .../files/0001-amcl-fix-compilation-with-gcc-v7.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-ros/navigation/files/0001-amcl-fix-compilation-with-gcc-v7.patch b/recipes-ros/navigation/files/0001-amcl-fix-compilation-with-gcc-v7.patch index 54c6768..4c11d36 100644 --- a/recipes-ros/navigation/files/0001-amcl-fix-compilation-with-gcc-v7.patch +++ b/recipes-ros/navigation/files/0001-amcl-fix-compilation-with-gcc-v7.patch @@ -12,7 +12,7 @@ src/amcl/map/map_cspace.cpp:98:34: error: call of overloaded 'abs(unsigned int)' Use `int abs(int)` flavour of the abs() function. -Upstream-Status: Submitted [https://github.com/ros-planning/navigation/pull/587] +Upstream-Status: Backported [included in kinetic; will not be backported to indigo releases] --- amcl/src/amcl/map/map_cspace.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) From 12929bb95272412e032551ee9a76ef0febac62a5 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 2 Jan 2018 08:39:18 +0100 Subject: [PATCH 9/9] moveit: updating to 0.7.13 --- .../moveit/{moveit-core_0.7.12.bb => moveit-core_0.7.13.bb} | 0 ...{moveit-kinematics_0.7.12.bb => moveit-kinematics_0.7.13.bb} | 2 +- ...t-planners-ompl_0.7.12.bb => moveit-planners-ompl_0.7.13.bb} | 2 +- ...manipulation_0.7.12.bb => moveit-ros-manipulation_0.7.13.bb} | 0 ...ros-move-group_0.7.12.bb => moveit-ros-move-group_0.7.13.bb} | 0 ...ros-perception_0.7.12.bb => moveit-ros-perception_0.7.13.bb} | 0 ...eit-ros-planning_0.7.12.bb => moveit-ros-planning_0.7.13.bb} | 0 ...ger_0.7.12.bb => moveit-simple-controller-manager_0.7.13.bb} | 2 +- recipes-ros/moveit/moveit.inc | 2 +- 9 files changed, 4 insertions(+), 4 deletions(-) rename recipes-ros/moveit/{moveit-core_0.7.12.bb => moveit-core_0.7.13.bb} (100%) rename recipes-ros/moveit/{moveit-kinematics_0.7.12.bb => moveit-kinematics_0.7.13.bb} (78%) rename recipes-ros/moveit/{moveit-planners-ompl_0.7.12.bb => moveit-planners-ompl_0.7.13.bb} (69%) rename recipes-ros/moveit/{moveit-ros-manipulation_0.7.12.bb => moveit-ros-manipulation_0.7.13.bb} (100%) rename recipes-ros/moveit/{moveit-ros-move-group_0.7.12.bb => moveit-ros-move-group_0.7.13.bb} (100%) rename recipes-ros/moveit/{moveit-ros-perception_0.7.12.bb => moveit-ros-perception_0.7.13.bb} (100%) rename recipes-ros/moveit/{moveit-ros-planning_0.7.12.bb => moveit-ros-planning_0.7.13.bb} (100%) rename recipes-ros/moveit/{moveit-simple-controller-manager_0.7.12.bb => moveit-simple-controller-manager_0.7.13.bb} (76%) diff --git a/recipes-ros/moveit/moveit-core_0.7.12.bb b/recipes-ros/moveit/moveit-core_0.7.13.bb similarity index 100% rename from recipes-ros/moveit/moveit-core_0.7.12.bb rename to recipes-ros/moveit/moveit-core_0.7.13.bb diff --git a/recipes-ros/moveit/moveit-kinematics_0.7.12.bb b/recipes-ros/moveit/moveit-kinematics_0.7.13.bb similarity index 78% rename from recipes-ros/moveit/moveit-kinematics_0.7.12.bb rename to recipes-ros/moveit/moveit-kinematics_0.7.13.bb index 4507533..6433f77 100644 --- a/recipes-ros/moveit/moveit-kinematics_0.7.12.bb +++ b/recipes-ros/moveit/moveit-kinematics_0.7.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Package for all inverse kinematics solvers in MoveIt!" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "moveit-core moveit-ros-planning" diff --git a/recipes-ros/moveit/moveit-planners-ompl_0.7.12.bb b/recipes-ros/moveit/moveit-planners-ompl_0.7.13.bb similarity index 69% rename from recipes-ros/moveit/moveit-planners-ompl_0.7.12.bb rename to recipes-ros/moveit/moveit-planners-ompl_0.7.13.bb index 512a3a7..7b1e66d 100644 --- a/recipes-ros/moveit/moveit-planners-ompl_0.7.12.bb +++ b/recipes-ros/moveit/moveit-planners-ompl_0.7.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "MoveIt interface to OMPL" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "moveit-core moveit-ros-planning ompl" diff --git a/recipes-ros/moveit/moveit-ros-manipulation_0.7.12.bb b/recipes-ros/moveit/moveit-ros-manipulation_0.7.13.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-manipulation_0.7.12.bb rename to recipes-ros/moveit/moveit-ros-manipulation_0.7.13.bb diff --git a/recipes-ros/moveit/moveit-ros-move-group_0.7.12.bb b/recipes-ros/moveit/moveit-ros-move-group_0.7.13.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-move-group_0.7.12.bb rename to recipes-ros/moveit/moveit-ros-move-group_0.7.13.bb diff --git a/recipes-ros/moveit/moveit-ros-perception_0.7.12.bb b/recipes-ros/moveit/moveit-ros-perception_0.7.13.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-perception_0.7.12.bb rename to recipes-ros/moveit/moveit-ros-perception_0.7.13.bb diff --git a/recipes-ros/moveit/moveit-ros-planning_0.7.12.bb b/recipes-ros/moveit/moveit-ros-planning_0.7.13.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-planning_0.7.12.bb rename to recipes-ros/moveit/moveit-ros-planning_0.7.13.bb diff --git a/recipes-ros/moveit/moveit-simple-controller-manager_0.7.12.bb b/recipes-ros/moveit/moveit-simple-controller-manager_0.7.13.bb similarity index 76% rename from recipes-ros/moveit/moveit-simple-controller-manager_0.7.12.bb rename to recipes-ros/moveit/moveit-simple-controller-manager_0.7.13.bb index 78b8c9c..af5265a 100644 --- a/recipes-ros/moveit/moveit-simple-controller-manager_0.7.12.bb +++ b/recipes-ros/moveit/moveit-simple-controller-manager_0.7.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A generic, simple controller manager plugin for MoveIt." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "moveit-core actionlib control-msgs pluginlib roscpp" diff --git a/recipes-ros/moveit/moveit.inc b/recipes-ros/moveit/moveit.inc index e408240..f473c76 100644 --- a/recipes-ros/moveit/moveit.inc +++ b/recipes-ros/moveit/moveit.inc @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/ros-planning/${ROS_SPN}.git;branch=indigo-devel;protocol=git" -SRCREV = "820657a985dd492edb9bfee207e864f378329b60" +SRCREV = "901e66c1319a3e7ee0e0879898b8d5fa865563c3" S = "${WORKDIR}/git/${ROS_BPN}"