From f734e4466a546163a8224c547b8e0034c1d4dcdd Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 14 Aug 2017 11:09:48 +0200 Subject: [PATCH 1/3] geometry: updating to 1.11.9 In the tf recipe, this commit adjusts the license-file line and drops the upstream-accepted patch due to update. With the update of eigen-conversions and tf-conversions, the compilation of both packages fails with: ``` | [...]: fatal error: Eigen/Core: No such file or directory | #include | ^~~~~~~~~~~~ | compilation terminated. ``` It fails as the upstream development uses the Eigen3 CMake find script instead of the ROS cmake_modules find script, and the Eigen3 CMake find script does not work in the current openembedded-core and meta-openembedded setup (cf. #501). Hence, this commit applies a patch to revert the CMakeLists.txt to use ROS cmake_modules to find Eigen. This patch must be applied until issue #501 is resolved in the upstream development. Signed-off-by: Lukas Bulwahn --- ..._1.11.8.bb => eigen-conversions_1.11.9.bb} | 0 ...cmake_modules-Find-script-partly-rev.patch | 64 +++++++++++++++++++ recipes-ros/geometry/geometry.inc | 6 +- ...ns_1.11.8.bb => kdl-conversions_1.11.9.bb} | 0 ...ons_1.11.8.bb => tf-conversions_1.11.9.bb} | 0 ...such-file-or-directory-errors-in-GCC.patch | 35 ---------- .../geometry/{tf_1.11.8.bb => tf_1.11.9.bb} | 4 +- 7 files changed, 69 insertions(+), 40 deletions(-) rename recipes-ros/geometry/{eigen-conversions_1.11.8.bb => eigen-conversions_1.11.9.bb} (100%) create mode 100644 recipes-ros/geometry/files/0001-find-Eigen-with-cmake_modules-Find-script-partly-rev.patch rename recipes-ros/geometry/{kdl-conversions_1.11.8.bb => kdl-conversions_1.11.9.bb} (100%) rename recipes-ros/geometry/{tf-conversions_1.11.8.bb => tf-conversions_1.11.9.bb} (100%) delete mode 100644 recipes-ros/geometry/tf/0001-Fix-stdlib.h-No-such-file-or-directory-errors-in-GCC.patch rename recipes-ros/geometry/{tf_1.11.8.bb => tf_1.11.9.bb} (75%) diff --git a/recipes-ros/geometry/eigen-conversions_1.11.8.bb b/recipes-ros/geometry/eigen-conversions_1.11.9.bb similarity index 100% rename from recipes-ros/geometry/eigen-conversions_1.11.8.bb rename to recipes-ros/geometry/eigen-conversions_1.11.9.bb diff --git a/recipes-ros/geometry/files/0001-find-Eigen-with-cmake_modules-Find-script-partly-rev.patch b/recipes-ros/geometry/files/0001-find-Eigen-with-cmake_modules-Find-script-partly-rev.patch new file mode 100644 index 0000000..c823d6b --- /dev/null +++ b/recipes-ros/geometry/files/0001-find-Eigen-with-cmake_modules-Find-script-partly-rev.patch @@ -0,0 +1,64 @@ +From fc3670a9a37c806458fba9ef6332a63ea8f31951 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Mon, 14 Aug 2017 18:00:37 +0200 +Subject: [PATCH] find Eigen with cmake_modules' Find script (partly reverts + 707eb4119d) + +Upstream-Status: Inappropriate [openembedded-specific adjustment] +--- + eigen_conversions/CMakeLists.txt | 6 +++--- + tf_conversions/CMakeLists.txt | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/eigen_conversions/CMakeLists.txt b/eigen_conversions/CMakeLists.txt +index 5277aea..f056048 100644 +--- a/eigen_conversions/CMakeLists.txt ++++ b/eigen_conversions/CMakeLists.txt +@@ -3,15 +3,15 @@ project(eigen_conversions) + + find_package(orocos_kdl REQUIRED) + find_package(catkin REQUIRED cmake_modules geometry_msgs std_msgs) +-find_package(Eigen3 REQUIRED) ++find_package(Eigen REQUIRED) + +-include_directories(SYSTEM ${EIGEN3_INCLUDE_DIRS}) ++include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS}) + include_directories(include ${catkin_INCLUDE_DIRS} ${orocos_kdl_INCLUDE_DIRS}) + link_directories(${catkin_LIBRARY_DIRS}) + link_directories(${orocos_kdl_LIBRARY_DIRS}) + + catkin_package( +- INCLUDE_DIRS include ${EIGEN3_INCLUDE_DIRS} ++ INCLUDE_DIRS include ${EIGEN_INCLUDE_DIRS} + LIBRARIES ${PROJECT_NAME} + CATKIN_DEPENDS geometry_msgs std_msgs + DEPENDS orocos_kdl +diff --git a/tf_conversions/CMakeLists.txt b/tf_conversions/CMakeLists.txt +index 543bbdb..5797b2f 100644 +--- a/tf_conversions/CMakeLists.txt ++++ b/tf_conversions/CMakeLists.txt +@@ -3,18 +3,18 @@ project(tf_conversions) + + find_package(orocos_kdl REQUIRED) + find_package(catkin REQUIRED cmake_modules geometry_msgs kdl_conversions tf) +-find_package(Eigen3 REQUIRED) ++find_package(Eigen REQUIRED) + + catkin_python_setup() + + catkin_package( + INCLUDE_DIRS include + LIBRARIES ${PROJECT_NAME} +- DEPENDS EIGEN3 orocos_kdl ++ DEPENDS EIGEN orocos_kdl + CATKIN_DEPENDS geometry_msgs kdl_conversions tf + ) + +-include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${orocos_kdl_INCLUDE_DIRS}) ++include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${orocos_kdl_INCLUDE_DIRS}) + + # Needed due to no full filename in orocos_kdl pkg-config export + link_directories(${orocos_kdl_LIBRARY_DIRS}) +-- +1.9.1 + diff --git a/recipes-ros/geometry/geometry.inc b/recipes-ros/geometry/geometry.inc index 70288af..a6c644c 100644 --- a/recipes-ros/geometry/geometry.inc +++ b/recipes-ros/geometry/geometry.inc @@ -1,6 +1,8 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "a5e9e0a164c569bea3b4a1a07d3b104f" -SRC_URI[sha256sum] = "a372f2225d6d9625dadc9dee817281a22dfb4b4dc8fd129ee1fb9375993bfd88" +SRC_URI[md5sum] = "5d55aa4d8b5fea53e0fc72605843b4d0" +SRC_URI[sha256sum] = "8c8e20d28d352b3ccb227ca7da39a1dddc051cf8309f90a46d6b0c7b2e398d33" + +SRC_URI += "file://0001-find-Eigen-with-cmake_modules-Find-script-partly-rev.patch;patchdir=.." S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/geometry/kdl-conversions_1.11.8.bb b/recipes-ros/geometry/kdl-conversions_1.11.9.bb similarity index 100% rename from recipes-ros/geometry/kdl-conversions_1.11.8.bb rename to recipes-ros/geometry/kdl-conversions_1.11.9.bb diff --git a/recipes-ros/geometry/tf-conversions_1.11.8.bb b/recipes-ros/geometry/tf-conversions_1.11.9.bb similarity index 100% rename from recipes-ros/geometry/tf-conversions_1.11.8.bb rename to recipes-ros/geometry/tf-conversions_1.11.9.bb diff --git a/recipes-ros/geometry/tf/0001-Fix-stdlib.h-No-such-file-or-directory-errors-in-GCC.patch b/recipes-ros/geometry/tf/0001-Fix-stdlib.h-No-such-file-or-directory-errors-in-GCC.patch deleted file mode 100644 index fcb253e..0000000 --- a/recipes-ros/geometry/tf/0001-Fix-stdlib.h-No-such-file-or-directory-errors-in-GCC.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b0d31cc1e9a43b45d216ee7f804e901a5c0f8936 Mon Sep 17 00:00:00 2001 -From: Hodorgasm -Date: Mon, 19 Sep 2016 17:58:22 -0400 -Subject: [PATCH] Fix "stdlib.h: No such file or directory" errors in GCC-6 - -Including '-isystem /usr/include' breaks building with GCC-6. -See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 - -Upstream-Status: Accepted [https://github.com/ros/geometry/commit/b0d31cc1e9a43b45d216ee7f804e901a5c0f8936] - -This patch has been generated with: - `git format-patch -1 b0d31cc1e9a43b45d216ee7f804e901a5c0f8936` -in the geometry repository. - -Signed-off-by: Lukas Bulwahn ---- - tf/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt -index 8077561..cf72127 100644 ---- a/tf/CMakeLists.txt -+++ b/tf/CMakeLists.txt -@@ -8,7 +8,7 @@ find_package(catkin COMPONENTS angles geometry_msgs message_filters message_gene - - catkin_python_setup() - --include_directories(SYSTEM ${Boost_INCLUDE_DIR} -+include_directories(${Boost_INCLUDE_DIR} - ${catkin_INCLUDE_DIRS} - ) - include_directories(include) --- -2.5.5 - diff --git a/recipes-ros/geometry/tf_1.11.8.bb b/recipes-ros/geometry/tf_1.11.9.bb similarity index 75% rename from recipes-ros/geometry/tf_1.11.8.bb rename to recipes-ros/geometry/tf_1.11.9.bb index a965cea..50d9ea4 100644 --- a/recipes-ros/geometry/tf_1.11.8.bb +++ b/recipes-ros/geometry/tf_1.11.9.bb @@ -1,14 +1,12 @@ DESCRIPTION = "tf is a package that lets the user keep track of multiple coordinate frames over time." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=18;endline=18;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=21;endline=21;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "angles geometry-msgs message-filters sensor-msgs tf2-ros" require geometry.inc -SRC_URI += "file://0001-Fix-stdlib.h-No-such-file-or-directory-errors-in-GCC.patch;striplevel=2" - RDEPENDS_${PN} = "${PYTHON_PN}-numpy" # This option disables python support in case of python3 flavour of ROS because From 5bebd0e448ea15af94e8e564abefd553fa2c534a Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 14 Aug 2017 11:09:48 +0200 Subject: [PATCH 2/3] geometry2: updating to 0.5.16 --- recipes-ros/geometry2/geometry2.inc | 4 ++-- ...f2-geometry-msgs_0.5.15.bb => tf2-geometry-msgs_0.5.16.bb} | 0 .../geometry2/{tf2-kdl_0.5.15.bb => tf2-kdl_0.5.16.bb} | 0 .../geometry2/{tf2-msgs_0.5.15.bb => tf2-msgs_0.5.16.bb} | 0 recipes-ros/geometry2/{tf2-py_0.5.15.bb => tf2-py_0.5.16.bb} | 0 .../geometry2/{tf2-ros_0.5.15.bb => tf2-ros_0.5.16.bb} | 0 .../{tf2-sensor-msgs_0.5.15.bb => tf2-sensor-msgs_0.5.16.bb} | 0 .../geometry2/{tf2-tools_0.5.15.bb => tf2-tools_0.5.16.bb} | 0 recipes-ros/geometry2/{tf2_0.5.15.bb => tf2_0.5.16.bb} | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/geometry2/{tf2-geometry-msgs_0.5.15.bb => tf2-geometry-msgs_0.5.16.bb} (100%) rename recipes-ros/geometry2/{tf2-kdl_0.5.15.bb => tf2-kdl_0.5.16.bb} (100%) rename recipes-ros/geometry2/{tf2-msgs_0.5.15.bb => tf2-msgs_0.5.16.bb} (100%) rename recipes-ros/geometry2/{tf2-py_0.5.15.bb => tf2-py_0.5.16.bb} (100%) rename recipes-ros/geometry2/{tf2-ros_0.5.15.bb => tf2-ros_0.5.16.bb} (100%) rename recipes-ros/geometry2/{tf2-sensor-msgs_0.5.15.bb => tf2-sensor-msgs_0.5.16.bb} (100%) rename recipes-ros/geometry2/{tf2-tools_0.5.15.bb => tf2-tools_0.5.16.bb} (100%) rename recipes-ros/geometry2/{tf2_0.5.15.bb => tf2_0.5.16.bb} (100%) diff --git a/recipes-ros/geometry2/geometry2.inc b/recipes-ros/geometry2/geometry2.inc index 8064b00..235e387 100644 --- a/recipes-ros/geometry2/geometry2.inc +++ b/recipes-ros/geometry2/geometry2.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] = "1a15fc5764478d1297417d3ca83ad200" -SRC_URI[sha256sum] = "fba4c223e85923060d76f1113b346207b2d36cda0e2c3393ec96ff99ba918dbe" +SRC_URI[md5sum] = "bd0907555fbbab035a03016729a48b7a" +SRC_URI[sha256sum] = "61001913ea7568a513171f57a09f02905918cee0b558baa27f7439fbb79700cb" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/geometry2/tf2-geometry-msgs_0.5.15.bb b/recipes-ros/geometry2/tf2-geometry-msgs_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2-geometry-msgs_0.5.15.bb rename to recipes-ros/geometry2/tf2-geometry-msgs_0.5.16.bb diff --git a/recipes-ros/geometry2/tf2-kdl_0.5.15.bb b/recipes-ros/geometry2/tf2-kdl_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2-kdl_0.5.15.bb rename to recipes-ros/geometry2/tf2-kdl_0.5.16.bb diff --git a/recipes-ros/geometry2/tf2-msgs_0.5.15.bb b/recipes-ros/geometry2/tf2-msgs_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2-msgs_0.5.15.bb rename to recipes-ros/geometry2/tf2-msgs_0.5.16.bb diff --git a/recipes-ros/geometry2/tf2-py_0.5.15.bb b/recipes-ros/geometry2/tf2-py_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2-py_0.5.15.bb rename to recipes-ros/geometry2/tf2-py_0.5.16.bb diff --git a/recipes-ros/geometry2/tf2-ros_0.5.15.bb b/recipes-ros/geometry2/tf2-ros_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2-ros_0.5.15.bb rename to recipes-ros/geometry2/tf2-ros_0.5.16.bb diff --git a/recipes-ros/geometry2/tf2-sensor-msgs_0.5.15.bb b/recipes-ros/geometry2/tf2-sensor-msgs_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2-sensor-msgs_0.5.15.bb rename to recipes-ros/geometry2/tf2-sensor-msgs_0.5.16.bb diff --git a/recipes-ros/geometry2/tf2-tools_0.5.15.bb b/recipes-ros/geometry2/tf2-tools_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2-tools_0.5.15.bb rename to recipes-ros/geometry2/tf2-tools_0.5.16.bb diff --git a/recipes-ros/geometry2/tf2_0.5.15.bb b/recipes-ros/geometry2/tf2_0.5.16.bb similarity index 100% rename from recipes-ros/geometry2/tf2_0.5.15.bb rename to recipes-ros/geometry2/tf2_0.5.16.bb From 1d70c411c1ff3f1d4c01243e4ee90bb646855527 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 14 Aug 2017 11:09:49 +0200 Subject: [PATCH 3/3] moveit: updating to 0.7.12 --- .../moveit/{moveit-core_0.7.11.bb => moveit-core_0.7.12.bb} | 0 ...oveit-kinematics_0.7.11.bb => moveit-kinematics_0.7.12.bb} | 0 ...planners-ompl_0.7.11.bb => moveit-planners-ompl_0.7.12.bb} | 0 ...nipulation_0.7.11.bb => moveit-ros-manipulation_0.7.12.bb} | 0 ...s-move-group_0.7.11.bb => moveit-ros-move-group_0.7.12.bb} | 0 ...s-perception_0.7.11.bb => moveit-ros-perception_0.7.12.bb} | 0 ...t-ros-planning_0.7.11.bb => moveit-ros-planning_0.7.12.bb} | 0 ...r_0.7.11.bb => moveit-simple-controller-manager_0.7.12.bb} | 0 recipes-ros/moveit/moveit.inc | 4 ++-- 9 files changed, 2 insertions(+), 2 deletions(-) rename recipes-ros/moveit/{moveit-core_0.7.11.bb => moveit-core_0.7.12.bb} (100%) rename recipes-ros/moveit/{moveit-kinematics_0.7.11.bb => moveit-kinematics_0.7.12.bb} (100%) rename recipes-ros/moveit/{moveit-planners-ompl_0.7.11.bb => moveit-planners-ompl_0.7.12.bb} (100%) rename recipes-ros/moveit/{moveit-ros-manipulation_0.7.11.bb => moveit-ros-manipulation_0.7.12.bb} (100%) rename recipes-ros/moveit/{moveit-ros-move-group_0.7.11.bb => moveit-ros-move-group_0.7.12.bb} (100%) rename recipes-ros/moveit/{moveit-ros-perception_0.7.11.bb => moveit-ros-perception_0.7.12.bb} (100%) rename recipes-ros/moveit/{moveit-ros-planning_0.7.11.bb => moveit-ros-planning_0.7.12.bb} (100%) rename recipes-ros/moveit/{moveit-simple-controller-manager_0.7.11.bb => moveit-simple-controller-manager_0.7.12.bb} (100%) diff --git a/recipes-ros/moveit/moveit-core_0.7.11.bb b/recipes-ros/moveit/moveit-core_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-core_0.7.11.bb rename to recipes-ros/moveit/moveit-core_0.7.12.bb diff --git a/recipes-ros/moveit/moveit-kinematics_0.7.11.bb b/recipes-ros/moveit/moveit-kinematics_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-kinematics_0.7.11.bb rename to recipes-ros/moveit/moveit-kinematics_0.7.12.bb diff --git a/recipes-ros/moveit/moveit-planners-ompl_0.7.11.bb b/recipes-ros/moveit/moveit-planners-ompl_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-planners-ompl_0.7.11.bb rename to recipes-ros/moveit/moveit-planners-ompl_0.7.12.bb diff --git a/recipes-ros/moveit/moveit-ros-manipulation_0.7.11.bb b/recipes-ros/moveit/moveit-ros-manipulation_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-manipulation_0.7.11.bb rename to recipes-ros/moveit/moveit-ros-manipulation_0.7.12.bb diff --git a/recipes-ros/moveit/moveit-ros-move-group_0.7.11.bb b/recipes-ros/moveit/moveit-ros-move-group_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-move-group_0.7.11.bb rename to recipes-ros/moveit/moveit-ros-move-group_0.7.12.bb diff --git a/recipes-ros/moveit/moveit-ros-perception_0.7.11.bb b/recipes-ros/moveit/moveit-ros-perception_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-perception_0.7.11.bb rename to recipes-ros/moveit/moveit-ros-perception_0.7.12.bb diff --git a/recipes-ros/moveit/moveit-ros-planning_0.7.11.bb b/recipes-ros/moveit/moveit-ros-planning_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-ros-planning_0.7.11.bb rename to recipes-ros/moveit/moveit-ros-planning_0.7.12.bb diff --git a/recipes-ros/moveit/moveit-simple-controller-manager_0.7.11.bb b/recipes-ros/moveit/moveit-simple-controller-manager_0.7.12.bb similarity index 100% rename from recipes-ros/moveit/moveit-simple-controller-manager_0.7.11.bb rename to recipes-ros/moveit/moveit-simple-controller-manager_0.7.12.bb diff --git a/recipes-ros/moveit/moveit.inc b/recipes-ros/moveit/moveit.inc index 870c73f..f70f5c7 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] = "6b8c169cb96ae4eb4fe3a67acb77915b" -SRC_URI[sha256sum] = "880dd7bf65f82eac3dd87104bd30389fcf8af18790fc15e6597964aec50db5a1" +SRC_URI[md5sum] = "a91a68a28f8e0d7eb98ed348ff6b385b" +SRC_URI[sha256sum] = "8dd843a371800868d0c9fd2fe3eeb019b173e1950357167f54b8edd8042d9f65" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"