summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-10-11 17:43:26 +0200
committerAlexis Ballier <aballier@gentoo.org>2015-10-11 17:43:26 +0200
commitdaf3d8ef9b28799349509a79dde4942a272952f0 (patch)
tree2d5112acd02eec065d08db0e521551c010d1d7ad
parentdev-ros/octomap_ros: Initial import. Ebuild by me. (diff)
downloadgentoo-daf3d8ef9b28799349509a79dde4942a272952f0.tar.gz
gentoo-daf3d8ef9b28799349509a79dde4942a272952f0.tar.bz2
gentoo-daf3d8ef9b28799349509a79dde4942a272952f0.zip
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.
-rw-r--r--eclass/ros-catkin.eclass2
1 files changed, 1 insertions, 1 deletions
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}"