diff --git a/recipes-ros/urdf-tutorial/urdf-tutorial/0001-also-build-with-CATKIN_ENABLE_TESTING-OFF.patch b/recipes-ros/urdf-tutorial/urdf-tutorial/0001-also-build-with-CATKIN_ENABLE_TESTING-OFF.patch deleted file mode 100644 index 50ef049..0000000 --- a/recipes-ros/urdf-tutorial/urdf-tutorial/0001-also-build-with-CATKIN_ENABLE_TESTING-OFF.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e125886b0c497f01541868dc184130e33089f116 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Tue, 2 May 2017 08:42:14 +0200 -Subject: [PATCH] also build with CATKIN_ENABLE_TESTING=OFF - -Upstream-Status: Pending - -Signed-off-by: Lukas Bulwahn ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 474363f..20367d9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,10 +1,13 @@ - cmake_minimum_required(VERSION 2.8.3) - project(urdf_tutorial) - --find_package(catkin REQUIRED roslaunch) -+find_package(catkin REQUIRED) - catkin_package() - --roslaunch_add_file_check(launch) -+if (CATKIN_ENABLE_TESTING) -+ find_package(roslaunch REQUIRED) -+ roslaunch_add_file_check(launch) -+endif() - - install(DIRECTORY config images meshes launch rviz urdf - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) --- -1.9.1 - diff --git a/recipes-ros/urdf-tutorial/urdf-tutorial_0.2.5.bb b/recipes-ros/urdf-tutorial/urdf-tutorial_0.3.0.bb similarity index 58% rename from recipes-ros/urdf-tutorial/urdf-tutorial_0.2.5.bb rename to recipes-ros/urdf-tutorial/urdf-tutorial_0.3.0.bb index 08a8f4a..6eb5865 100644 --- a/recipes-ros/urdf-tutorial/urdf-tutorial_0.2.5.bb +++ b/recipes-ros/urdf-tutorial/urdf-tutorial_0.3.0.bb @@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de DEPENDS = "urdf" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "2ea186e30b865fb6c6e535add7bd445e" -SRC_URI[sha256sum] = "c90e7ca21bb51e851f1609c853103f39711da18f79c9915cd4d5fc3f100031c2" +SRC_URI[md5sum] = "b8be1589ce7779f43f8de30cee725c52" +SRC_URI[sha256sum] = "c54a8967ff9fdab1fd3a8cd42994e874b0d332e186338e78381317ebae118b92" -SRC_URI += "file://0001-also-build-with-CATKIN_ENABLE_TESTING-OFF.patch" - -S = "${WORKDIR}/${ROS_SP}" +S = "${WORKDIR}/${ROS_SP}/${ROS_SPN}" inherit catkin