Merge pull request #571 from bulwahn/indigo-updates

recipe updates for indigo distribution on 2017-12-26
This commit is contained in:
Dmitry Rozhkov 2018-01-02 12:05:02 +02:00 committed by GitHub
commit 6d08433f9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 32 additions and 138 deletions

View File

@ -2,12 +2,12 @@ DESCRIPTION = "The actionlib stack provides a standardized interface for interfa
preemptable tasks." preemptable tasks."
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "actionlib-msgs roscpp"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "55232c305dcadd9b265e512dc61edd9c" SRC_URI[md5sum] = "f75eaec35fe5cc29c4af308afc34e29a"
SRC_URI[sha256sum] = "0e0eb18e964cfd25490875295950760fb468fd30cab707c0138ddada131be7c6" SRC_URI[sha256sum] = "e600f0b3f15ab41992adb7e5e95b89a8df6b679c4eb4b7c0771bdb74ed4da623"
inherit catkin inherit catkin

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "3afd0058ae7bc2868a5d086f7737465a" SRC_URI[md5sum] = "1c008e362a2b9eee5b5a57e46452b9cf"
SRC_URI[sha256sum] = "67d7f1cbfe1a007ba48aa477f722e185485006cbd0abdd1460f580d677f89643" SRC_URI[sha256sum] = "44b6455ebc6406b9d2ced5efe590bcbf22cf3fe3107d363409d0262aaa21ebb9"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -6,7 +6,7 @@ heartbeat times out.\
" "
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "message-generation std-msgs roscpp-serialization"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "C++ implementation of bond, a mechanism for checking when another process has terminated." DESCRIPTION = "C++ implementation of bond, a mechanism for checking when another process has terminated."
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "bond boost cmake-modules roscpp smclib"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Python implementation of bond, a mechanism for checking when another process has terminated." DESCRIPTION = "Python implementation of bond, a mechanism for checking when another process has terminated."
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "bond rospy smclib"

View File

@ -7,6 +7,6 @@ depends on, but it does not contain the compiler itself. \
" "
SECTION = "devel" SECTION = "devel"
LICENSE = "MPL-1.1" 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 require bond-core.inc

View File

@ -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." classes without the explicit declaration (i.e. header file) for those classes."
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" 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 = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "faa7b419ba0ea1714f71404c2e76af0a" SRC_URI[md5sum] = "3684301f5f1e8c901391e929564b9743"
SRC_URI[sha256sum] = "4413ea6492bc75a197fa2f219f59e46f70a33dc740aef0fba4f583c3de7bbbc3" SRC_URI[sha256sum] = "fb58efe5ec10597770d32f67093976d1522b0e09dfa1b2b9ba1191081421ba49"
S = "${WORKDIR}/${ROS_SP}" S = "${WORKDIR}/${ROS_SP}"

View File

@ -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" 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 = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "2a11cd903e581f4e9cef57551e3f284b" SRC_URI[md5sum] = "9f125d76fb143f4206f2618f40f15d40"
SRC_URI[sha256sum] = "dc3e826930642d6a2e47e8847550c680d03649fa90ca521fa752ff01bd3b697c" SRC_URI[sha256sum] = "8998d5b4f23d4819ad92c2d37233cbd2dafe2480d689bffdbc666ed8e5c5aefa"
S = "${WORKDIR}/${ROS_SP}" S = "${WORKDIR}/${ROS_SP}"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Package for all inverse kinematics solvers in MoveIt!" DESCRIPTION = "Package for all inverse kinematics solvers in MoveIt!"
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "moveit-core moveit-ros-planning"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "MoveIt interface to OMPL" DESCRIPTION = "MoveIt interface to OMPL"
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "moveit-core moveit-ros-planning ompl"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "A generic, simple controller manager plugin for MoveIt." DESCRIPTION = "A generic, simple controller manager plugin for MoveIt."
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "moveit-core actionlib control-msgs pluginlib roscpp"

View File

@ -1,5 +1,5 @@
SRC_URI = "git://github.com/ros-planning/${ROS_SPN}.git;branch=indigo-devel;protocol=git" SRC_URI = "git://github.com/ros-planning/${ROS_SPN}.git;branch=indigo-devel;protocol=git"
SRCREV = "820657a985dd492edb9bfee207e864f378329b60" SRCREV = "901e66c1319a3e7ee0e0879898b8d5fa865563c3"
S = "${WORKDIR}/git/${ROS_BPN}" S = "${WORKDIR}/git/${ROS_BPN}"

View File

@ -1,35 +0,0 @@
From e6f3979ff8b988fe7992bf08a8267f1e11f58627 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
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 <lukas.bulwahn@gmail.com>
---
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

View File

@ -9,5 +9,3 @@ DEPENDS = "angles costmap-2d dynamic-reconfigure geometry-msgs libeigen message-
voxel-grid visualization-msgs" voxel-grid visualization-msgs"
require navigation.inc require navigation.inc
SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch;striplevel=2"

View File

@ -1,69 +0,0 @@
From def48f89c985736901bb7bbe427f65acd18ef8d6 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
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 <lukas.bulwahn@oss.bmw-carit.de>
Upstream-Status: Pending [https://github.com/ros-planning/navigation/pull/522]
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
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

View File

@ -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. 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 ++++---- amcl/src/amcl/map/map_cspace.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)

View File

@ -4,7 +4,8 @@ SECTION = "devel"
LICENSE = "BSD" LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=01c2bc31767ccb3a68e12f02612b2a97" 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 \ DEPENDS = "actionlib base-local-planner clear-costmap-recovery costmap-2d dynamic-reconfigure \
nav-core nav-msgs pluginlib roscpp rospy std-msgs std-srvs tf visualization-msgs" 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 require navigation.inc

View File

@ -1,9 +1,8 @@
SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "d7a392da183b3c2a5fce063e90cbf1f2" SRC_URI[md5sum] = "25918a8c5e9b64a74ed7776fcd9419cd"
SRC_URI[sha256sum] = "169f89a4a3a94437ffbf80a9b06b65471c17529169d1940a217e92d85481f18f" SRC_URI[sha256sum] = "0f98fae839023002769f4cbd770db87ad3ab9dd02faae7feda492fd38bda1407"
SRC_URI += "file://0001-address-gcc6-build-error.patch;patchdir=.. \ SRC_URI += "file://0001-amcl-fix-compilation-with-gcc-v7.patch;patchdir=.."
file://0001-amcl-fix-compilation-with-gcc-v7.patch;patchdir=.."
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "b453b5d5bb06ebfca393d9e8e3c845e2" SRC_URI[md5sum] = "043c4455172d2ec9cfb87385aa71dedc"
SRC_URI[sha256sum] = "50b8b3c01b577c8d71c92ec64ae516e030e2912bc5afcf66b2ada8bc39002544" SRC_URI[sha256sum] = "f41b124b769bde2a1dd603001e8e03b8310706780856fdb1660921dd66716be5"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "This package contains common nodelet tools such as a mux, demux and throttle." DESCRIPTION = "This package contains common nodelet tools such as a mux, demux and throttle."
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "dynamic-reconfigure ${PYTHON_PN}-rospkg"

View File

@ -8,7 +8,7 @@ for instantiating nodelets\
" "
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" DEPENDS = "bondcpp boost message-generation pluginlib rosconsole roscpp rospy std-msgs libtinyxml"

View File

@ -2,12 +2,12 @@ DESCRIPTION = "The pluginlib package provides tools for writing and dynamically
using the ROS build infrastructure." using the ROS build infrastructure."
SECTION = "devel" SECTION = "devel"
LICENSE = "BSD" 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" 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 = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "eb443817a26dc03b7c063e9bbb82439f" SRC_URI[md5sum] = "aa975b5a290de5e4fb2e86e234b686c0"
SRC_URI[sha256sum] = "53a0ccb7a4654d464271189fc44ba23d6be8d3ecdfb40506b9d9fb4a87f19d6c" SRC_URI[sha256sum] = "af7ac0e0aa77b6b1ff2f781482fe30e31cafd1087b708d0f1c2a51176c585614"
inherit catkin inherit catkin