| 1 |
commit: daf3d8ef9b28799349509a79dde4942a272952f0 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 15:43:26 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 15:43:26 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf3d8ef |
| 7 |
|
| 8 |
ros-catkin.eclass: Properly append VER_SUFFIX to S in non-live case. |
| 9 |
|
| 10 |
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. |
| 11 |
|
| 12 |
eclass/ros-catkin.eclass | 2 +- |
| 13 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass |
| 16 |
index f1bc32e..412ff66 100644 |
| 17 |
--- a/eclass/ros-catkin.eclass |
| 18 |
+++ b/eclass/ros-catkin.eclass |
| 19 |
@@ -125,7 +125,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then |
| 20 |
S=${WORKDIR}/${P}/${ROS_SUBDIR} |
| 21 |
else |
| 22 |
SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz" |
| 23 |
- S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}/${ROS_SUBDIR} |
| 24 |
+ S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR} |
| 25 |
fi |
| 26 |
|
| 27 |
HOMEPAGE="http://wiki.ros.org/${PN}" |
Archives