From fc81b68bfb3576cf35faafa7c1e88e6e9ba8e9dc Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Fri, 23 Sep 2016 10:31:23 +0200 Subject: [PATCH] diagnostics: updating to 1.8.10 and adjusting dependencies In 2014, the update of the diagnostics recipes from 1.8.3 to 1.8.4 failed due to reasons that seem not to be relevant anymore in the current version 1.8.10. As the diagnostic-aggregator recipe failed with gcc6 (cf. https://github.com/bmwcarit/meta-ros/issues/392), I revisited the diagnostics recipes and this commit updates them. The current diagnostics recipes in version 1.8.10 do not fail with gcc6, and is one step forward to build meta-ros with gcc6. Signed-off-by: Lukas Bulwahn --- ...ic-aggregator_1.8.3.bb => diagnostic-aggregator_1.8.10.bb} | 0 ...nostic-analysis_1.8.3.bb => diagnostic-analysis_1.8.10.bb} | 0 ...stics_1.8.3.bb => diagnostic-common-diagnostics_1.8.10.bb} | 2 +- ...agnostic-updater_1.8.3.bb => diagnostic-updater_1.8.10.bb} | 0 recipes-ros/diagnostics/diagnostics.inc | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename recipes-ros/diagnostics/{diagnostic-aggregator_1.8.3.bb => diagnostic-aggregator_1.8.10.bb} (100%) rename recipes-ros/diagnostics/{diagnostic-analysis_1.8.3.bb => diagnostic-analysis_1.8.10.bb} (100%) rename recipes-ros/diagnostics/{diagnostic-common-diagnostics_1.8.3.bb => diagnostic-common-diagnostics_1.8.10.bb} (88%) rename recipes-ros/diagnostics/{diagnostic-updater_1.8.3.bb => diagnostic-updater_1.8.10.bb} (100%) diff --git a/recipes-ros/diagnostics/diagnostic-aggregator_1.8.3.bb b/recipes-ros/diagnostics/diagnostic-aggregator_1.8.10.bb similarity index 100% rename from recipes-ros/diagnostics/diagnostic-aggregator_1.8.3.bb rename to recipes-ros/diagnostics/diagnostic-aggregator_1.8.10.bb diff --git a/recipes-ros/diagnostics/diagnostic-analysis_1.8.3.bb b/recipes-ros/diagnostics/diagnostic-analysis_1.8.10.bb similarity index 100% rename from recipes-ros/diagnostics/diagnostic-analysis_1.8.3.bb rename to recipes-ros/diagnostics/diagnostic-analysis_1.8.10.bb diff --git a/recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.3.bb b/recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.10.bb similarity index 88% rename from recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.3.bb rename to recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.10.bb index e680e80..f00a7d7 100644 --- a/recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.3.bb +++ b/recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.10.bb @@ -3,6 +3,6 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "rospy" +DEPENDS = "diagnostic-updater rospy" require diagnostics.inc diff --git a/recipes-ros/diagnostics/diagnostic-updater_1.8.3.bb b/recipes-ros/diagnostics/diagnostic-updater_1.8.10.bb similarity index 100% rename from recipes-ros/diagnostics/diagnostic-updater_1.8.3.bb rename to recipes-ros/diagnostics/diagnostic-updater_1.8.10.bb diff --git a/recipes-ros/diagnostics/diagnostics.inc b/recipes-ros/diagnostics/diagnostics.inc index 37870cd..f80132b 100644 --- a/recipes-ros/diagnostics/diagnostics.inc +++ b/recipes-ros/diagnostics/diagnostics.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] = "253985d33cf4e1ca745bdeeab79cbde3" -SRC_URI[sha256sum] = "9053c54762e22e90590c93fddfcd5d38214d3e5af1b7301aa7bdb7e21b82025c" +SRC_URI[md5sum] = "34bb53fbcf57924cc2c15e185451869b" +SRC_URI[sha256sum] = "9f2c6012f60e55e7735ba2d08dbc9bcd96f09ca9d3df223a0f1966bdab454dea" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"