p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #352 from bulwahn/master 

catkin: drop catkin_find from package (resolves #351)
This commit is contained in:
KristofRobot 2015-08-24 15:57:13 +02:00
parent 38854bd2bc 0a45665c72
commit 99e0f38618
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
recipes-ros/catkin/catkin_0.6.14.bb
View File

@ -6,12 +6,13 @@ RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++-symlinks \
catkin-runtime"
# The files in ${PYTHON_SITEPACKAGES_DIR} are installed by
# the catkin-runtime package. Therefore, we remove them here
# so that they are not installed.
# The files in ${PYTHON_SITEPACKAGES_DIR} and catkin_find are
# installed by the catkin-runtime package. Therefore, we remove
# them here so that they are not installed.
# Moreover: the ${ros_libdir}/python2.7 is empty. We need to
# remove it, otherwise the QA error [installed-vs-shipped] will hit on us.
do_install_append() {
rm ${D}${ros_bindir}/catkin_find
rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}
rmdir ${D}${ros_libdir}/python2.7
}