meta-ros/recipes-ros/catkin/catkin-runtime_0.6.19.bb

54 lines
1.9 KiB
BlitzBasic
Raw Normal View History

catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
ROS_SPN = "catkin"
require catkin.inc
catkin: ignore LD_LIBRARY_PATH set in environment_cache.py The script environment_cache.py generates a cache file that sets LD_LIBRARY_PATH so that the paths to target libs go first. This confuses native python3 which dynamically links to the target libpython3 and that leads to wrong linking of dynamic python modules: 04:09:43 | [ 16%] Generating Python from MSG std_msgs/Float32 04:09:43 | catkin_generated/env_cached.sh /srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/recipe-sysroot-native/usr/bin/python3-native/python3 /srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/recipe-sysroot/opt/ros/indigo/share/genpy/cmake/../../../lib/genpy/genmsg_py.py /srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/std_msgs-0.5.10/msg/Float32.msg -Istd_msgs:/srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/std_msgs-0.5.10/msg -p std_msgs -o /srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/build/devel/lib/python3.5/site-packages/std_msgs/msg 04:09:43 | Traceback (most recent call last): 04:09:43 | File "/srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/recipe-sysroot/opt/ros/indigo/share/genpy/cmake/../../../lib/genpy/genmsg_py.py", line 44, in <module> 04:09:43 | import genpy.generator 04:09:43 | File "/srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/recipe-sysroot/opt/ros/indigo/lib/python3.5/site-packages/genpy/__init__.py", line 34, in <module> 04:09:43 | from . message import Message, SerializationError, DeserializationError, MessageException, struct_I 04:09:43 | File "/srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/recipe-sysroot/opt/ros/indigo/lib/python3.5/site-packages/genpy/message.py", line 40, in <module> 04:09:43 | import math 04:09:43 | ImportError: /srv/jenkins/workspace/builder-slot-0/build/tmp-glibc/work/corei7-64-refkit-linux/std-msgs/0.5.10-r0/recipe-sysroot-native/usr/lib/python3.5/lib-dynload/math.cpython-35m-x86_64-linux-gnu.so: undefined symbol: _Py_dg_stdnan Don't put LD_LIBRARY_PATH to the cache, but use the value provided by bitbake. Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
2017-04-27 19:17:20 +08:00
SRC_URI += "\
file://0001-ignore-LD_LIBRARY_PATH-set-in-environment_cache.py.patch \
"
catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
S = "${WORKDIR}/catkin-${PV}"
# This package includes ONLY the python packages AND catkin_find
catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
# The catkin_${PV} package includes all other files
# from the catkin tool.
FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR} ${ros_bindir}/catkin_find ${ros_prefix}/.catkin"
FILES_${PN}-dev = ""
catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
RDEPENDS_${PN}_class-native = ""
catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
RDEPENDS_${PN} = "\
${PYTHON_PN}-catkin-pkg ${PYTHON_PN}-misc ${PYTHON_PN}-multiprocessing \
${PYTHON_PN}-shell ${PYTHON_PN}-xml ${PYTHON_PN}-pkgutil \
${@'python-argparse python-subprocess' if d.getVar('PYTHON_PN', True) == 'python' else ''}"
catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
# Delete everything but the python packages in order to avoid
# that the QA error [installed-vs-shipped] hits on us.
do_install_append() {
rm ${D}${ros_bindir}/catkin_*_*
rm ${D}${ros_bindir}/catkin_make
catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
rm -rf ${D}${ros_datadir}
rm -rf ${D}${ros_libdir}/pkgconfig
# Manually add the marker file
touch ${D}${ros_prefix}/.catkin
}
2017-06-03 14:17:33 +08:00
# Append environment hook for SDK
do_install_append_class-nativesdk() {
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
script=${D}${SDKPATHNATIVE}/environment-setup.d/catkin-runtime.sh
echo "export ROSDISTRO=${ROSDISTRO}" >> $script
echo "export PATH=\$PATH:\${OECORE_NATIVE_SYSROOT}/opt/ros/\${ROSDISTRO}/bin" >> $script
echo "export PYTHONPATH=\${OECORE_NATIVE_SYSROOT}/opt/ros/\${ROSDISTRO}/lib/python2.7/site-packages" >> $script
echo "export ROS_ROOT=\${OECORE_TARGET_SYSROOT}/opt/ros/\${ROSDISTRO}/share/ros" >> $script
echo "export CMAKE_PREFIX_PATH=\${OECORE_TARGET_SYSROOT}/opt/ros/\${ROSDISTRO}:\${OECORE_NATIVE_SYSROOT}/opt/ros/${ROSDISTRO}" >> $script
}
FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}"
catkin_sysroot_preprocess_append() {
install -m 644 -t ${SYSROOT_DESTDIR}${ros_prefix} ${D}${ros_prefix}/.catkin
catkin: split up catkin in order to reduce runtime dependencies The catkin package has got a runtime dependency to cmake, make, gcc and other build utilities. These dependencies, however, are only needed if it is desired to build with catkin on the target board. If we do not want to build on the target board, i.e., if we just want to use ros tools like roslaunch, only a small part of catkin (i.e., the corresponding python packages) is required to be deployed on the target board. Therefore, we introduce a new package called catkin-runtime. It installs only the python packages that are required for the ros tools to run. The roslib package now depends on catkin-runtime (previously: catkin). I also tried an alternative approach which just modifies catkin.bb: - add a catkin-runtime package - move PYTHON_SITEPACKAGES_DIR from FILES_catkin to FILES_CATKIN_RUNTIME - make catkin_runtime RDEPEND on the python stuff - make catkin RDEPEND on the cmake, binutils, ..., + catkin-runtime With this setup, for some reason, bitbake thinks that catkin-runtime still RDEPENDS on binutils. Therefore, I split up the catkin recipe into two different recipes. Here, the RDEPENDS are managed correctly. If we want to deploy catkin as a build tool on the board, we can simply add a runtime dependency to catkin. However, this should not be the default setup. Special thanks go to Tobias Henkel (tobias.henkel@bmw-carit.de) who deserves most of the credits for this patch. Signed-off-by: Andreas Baak <andreas.baak@bmw-carit.de>
2015-03-02 19:59:52 +08:00
}
2017-06-03 14:17:33 +08:00
BBCLASSEXTEND += "native nativesdk"