commit: daf3d8ef9b28799349509a79dde4942a272952f0 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Sun Oct 11 15:43:26 2015 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Sun Oct 11 15:43:26 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf3d8ef
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(-) diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index f1bc32e..412ff66 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}"