From daf3d8ef9b28799349509a79dde4942a272952f0 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sun, 11 Oct 2015 17:43:26 +0200 Subject: ros-catkin.eclass: Properly append VER_SUFFIX to S in non-live case. Some ROS packages append some suffix to their version, e.g. the ROS version they target, and the release tarballs have this string appended to their unpack directory too. --- eclass/ros-catkin.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eclass/ros-catkin.eclass') diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index f1bc32eb8f94..412ff66e01c9 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -125,7 +125,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then S=${WORKDIR}/${P}/${ROS_SUBDIR} else SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz" - S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}/${ROS_SUBDIR} + S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR} fi HOMEPAGE="http://wiki.ros.org/${PN}" -- cgit v1.2.3