Commit Graph

69 Commits

Author SHA1 Message Date
Dmitry Rozhkov 6fc7563de4 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 14:38:55 +03:00
Dmitry Rozhkov 3e201940f6 enable python3 compatible builds of ROS (resolves #458)
By default meta-ros uses python2. In case you want to get
python3-compatible builds add the following line to your local.conf:

    ROS_USE_PYTHON3 = "yes"

Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
2017-04-10 14:37:11 +03:00
Dmitry Rozhkov 38f722a81b catkin: drop python-catkin-pkg from catkin-runtime's build deps
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
2017-04-10 09:58:53 +03:00
Dmitry Rozhkov 5c53ae284e catkin: drop redundant build dependency on python-empy
It's enough to have python-empy-native in the build dependencies
of catkin and catkin-runtime. If we ever support on target
development then python-empy should be better added to
catkin's run-time dependencies.

Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
2017-04-05 14:57:41 +03:00
Lukas Bulwahn 4ffb50819a catkin: updating to 0.6.19 2017-03-19 21:51:29 +01:00
Dmitry Rozhkov b0be1fc475 catkin: relocate dependency's headers to current sysroot
If a package (A) depends on another package (B) and the package
B depends on Boost then it might happen that B produces BConfig.cmake
file where absolute paths to Boost's headers are put (because CMake's
standard FindBoost.cmake module reports absolute paths). In case of
Yocto it means that BConfig.cmake will contain something like
/path/to/build/tmp-glibc/work/i586/package_B/0.0.1/recipe-sysroot/usr/include.
The path may not exist at the moment when the package A is being built.
And that leads to the failure of the check this patch switches off.

The problem has been reported to catkin's issue tracker:
https://github.com/ros/catkin/issues/851

This patch "relocates" required headers from dependencies' sysroots
to the current sysroot by removing sysroot prefix from include dirs
in *Config.cmake files at the moment the files get created and
by prepending the include dirs again with the current sysroot prefix.

Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
2017-02-22 16:40:33 +02:00
Dmitry Rozhkov 2c1d47d075 catkin: avoid leaking host environment to sysroot when searching for libs
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
2017-02-22 16:28:15 +02:00
Dmitry Rozhkov e3e990de10 catkin: revert commit beb4677
The patch added in the reverted commit was meant to fix the issue
https://github.com/bmwcarit/meta-ros/issues/291

In fact it enables CMake to look for libraries in a host system which
leads to errors when a path is tested for a library presence with the
help of CMake's find_library() command: e.g. a non-existing host
directory is tested for library presence and find_library() returns
successfully because the library exists in bitbake's sysroot; then the
directory is used by the linker, but the library doesn't exist in the
directory -> failure. In worse cases the host directory may actually exist
and contain the library, but of wrong architecture, format or
incompatible ABI making finding the root cause a difficult task.

Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
2017-01-10 14:56:14 +02:00
Lukas Bulwahn b21e62c4c2 catkin: updating to 0.6.18 2016-06-14 11:18:39 +02:00
Lukas Bulwahn d997bcda5a catkin: patch _setup_util.py.in to address #384
In _setup_util.py.in, we use python provided by environment instead of
the generated one, as the generated python path can be arbitrarily long
(depending on the location of the build directory), and hence reaches
the shebang line limit, causing the script to fail at start-up.

The catkin developers changed the cmake-generated template _setup_util.py
to use @PYTHON_EXECUTABLE@ instead of /usr/bin/env python in changeset
bf12b40c2 [1]. We revert this change here to address the issue #384 [2].

[1] bf12b40c2a
[2] https://github.com/bmwcarit/meta-ros/issues/384

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
2016-06-01 11:36:37 +02:00
Lukas Bulwahn 940adbb15e catkin: updating to 0.6.16 2015-11-11 07:50:28 +01:00
Lukas Bulwahn cdedfc1994 catkin: updating to 0.6.15 2015-10-12 05:22:32 +02:00
Lukas Bulwahn 0a45665c72 catkin: drop catkin_find from package (resolves #351) 2015-08-24 10:07:46 +02:00
Kristof Robot 5244c5eb9c catkin-runtime: including catkin_find (resolves #349) 2015-08-18 18:49:04 +02:00
Kristof Robot 73180844a2 catkin-runtime: adding support for native version (resolves #338) 2015-07-25 12:36:23 +02:00
Lukas Bulwahn c3c74e47fe catkin: updating to 0.6.14 2015-06-10 10:56:43 +02:00
Ash Charles 790f56ddba Update from virtclass-native to class-native
As per Section 24.5.15 of the Yocto Manual [1], use of 'virtclass'
overrides has been deprecated since Yocto version 1.6. Update to
the new syntax.

[1] http://www.yoctoproject.org/docs/1.8/mega-manual/mega-manual.html

Signed-off-by: Ash Charles <ashcharles@gmail.com>
2015-05-28 13:14:52 -07:00
Lukas Bulwahn 4a941b3ba4 catkin: improve formatting
During some code inspections, I discovered that two consecutive
empty lines slipped in with the commit 185882428c.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
2015-05-05 07:11:56 +02:00
Lukas Bulwahn beb467747d catkin: including root path in library search (addresses #291)
On the meta-ros issue tracker, the issue #291 reports a
linking problem with rosconsole if ROS Hydro is also installed
on the host system. Kristof investigated in that, and published
a patch [1] on September 27th, 2014, which resolved the rosconsole
issue, but showed issues with urdfdom.

After reading through the discussion of issue #291, I started
initial testing with Kristof's patch. After testing Kristof's
patch, I also investigated the urdfdom problem, and came up with
the solution to revert the part of his patch, which moved
`-DCMAKE_INSTALL_PREFIX:PATH='${ros_prefix}'` to ros.bbclass.

Initially, I believed that the issue that was addressed with
the second part of Kristof's patch, has been resolved with
commit 7e2eb25e51. However,
the issue remains, but is only reproducible with the Ubuntu
saucy distribution.

On my first local setup, I could reproduce the issue #291 with
rosconsole on commit 47eab4263c.
After applying this commit, the issue with rosconsole did not
occur anymore on a clean fresh build.
`bitbake packagegroup-ros-world` did not show any other further
issues.

On my second local setup, on a newly-installed Ubuntu 12.04
(precise) system, I checked that the proposed commit resolves
some linking problems to boost, with some latest
OpenEmbedded-Core repository and the poky-dizzy distribution.
A detailed report of the investigation of this second local
setup is at my Github Gist [2].

In the first review of the pull request #318, Kristof noticed
that on an Ubuntu 13.10 (saucy), an issue with message-filters
still occurs. I could not reproduce this and other reported
errors on the Ubuntu 12.04 system, so I believe certain errors
only appear on certain Ubuntu distributions, which makes them
difficult to pinpoint. Therefore, we decided to defer the
resolution of this problem with Ubuntu 13.10.

To adjust to the concurrent work in pull request #319, during
the rebasing, the patch has been moved from the catkin directory
to the files directory.

Kristof remains the author of the applied patch, as I have not
modified the patch. I have put myself as this author's commit,
as I take the responsibility of the modifications compared to
Kristof's original work and I have tested this commit in my
test setting.

[1] 9ff76ffb7a
[2] https://gist.github.com/bulwahn/a8d5b7c27550b399f866

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>

catkin: move to files directory (fixup)
2015-03-30 09:19:42 +02:00
Andreas Baak 185882428c 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 13:22:06 +01:00
Lukas Bulwahn b84a2817b2 catkin: updating to 0.5.90 2015-01-21 09:23:17 +01:00
Timo Mueller 7836f37b17 catkin: Use ros_prefixed paths consistently
ROS and catkin packages install their assets to paths prefixed by
ros_prefix. As the recipe was trying to collect the assets for the dev
package in the wrong locations, the dev package was empty.

To address this we use the ros_prefix consistently across the recipe.
2015-01-09 13:11:28 +01:00
Lukas Bulwahn d6c9c19d14 catkin: updating to 0.5.89 2014-09-05 14:29:46 +02:00
Lukas Bulwahn 0c569027c4 catkin: updating to 0.5.88 2014-06-23 09:26:49 +02:00
Lukas Bulwahn 21f7799ee9 adding Upstream-Status remarks to patches in recipes-ros
This commit further adds a simple fix to the patch for the ros-comm
repository.
2014-04-24 07:03:36 +02:00
Lukas Bulwahn b36feeaadf catkin: updating to 0.5.86 2014-03-17 12:59:57 +01:00
Kristof Robot 66e2ad6620 catkin: adding pkgutil run dependency
Resolves import error in __init__.py files derived from catkin/cmake/templates/__init__.py.in template,
e.g. in tf:
  File "/usr/lib/python2.7/site-packages/tf/__init__.py", line 7, in <module>
    from pkgutil import extend_path
ImportError: No module named pkgutil
2014-03-08 17:58:25 +01:00
Lukas Bulwahn a28f76e348 catkin: updating to 0.5.85 2014-03-04 17:28:38 +01:00
Lukas Bulwahn b049323554 catkin: updating to 0.5.84 2014-03-04 17:28:38 +01:00
Lukas Bulwahn 317af7291f catkin: updating to 0.5.81 2014-03-04 17:28:37 +01:00
Lukas Bulwahn 733790b970 catkin: updating to 0.5.79 2014-03-03 08:12:12 +01:00
Lukas Bulwahn becce838d2 catkin: updating to 0.5.77
The catkin recipe is updated to 0.5.77 to be in line with
ef3a7449d7/hydro/release.yaml.
2013-10-11 10:42:21 +02:00
Lukas Bulwahn aa2ce283b6 removing native packages and dependencies
The native packages are not required anymore, because the needed
python scripts during compile time are also provided by the
cross-compiled packages and the python scripts are platform
independent. Only the catkin package is provided as native package.
2013-09-23 09:56:18 +02:00
Lukas Bulwahn 69ae31dfed catkin: updating to 0.5.74 2013-09-22 18:40:28 +02:00
Lukas Bulwahn 8f4d4ad2a6 catkin: updating to 0.5.73
The catkin recipe was updated to 0.5.73 to be in line with
4551e7c32d/hydro/release.yaml.
The previously applied patch has been included in 0.5.73 and is
removed from the recipe and this repository.
2013-08-26 10:57:16 +02:00
Stefan Herbrechtsmeier 1e7fafdcc1 catkin: Backport relocation changes
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
2013-08-26 07:40:20 +02:00
Stefan Herbrechtsmeier 3e6b386d2f Unify ros recipes
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
2013-08-26 07:40:20 +02:00
Lukas Bulwahn 9d48c558cd catkin class includes BBCLASSEXTENDS 2013-08-05 08:12:20 +02:00
Lukas Bulwahn 0e2d936412 catkin: correcting the downloadfilename that was missed before 2013-08-01 11:26:55 +02:00
Lukas Bulwahn 73b5485245 catkin: change from developing git version to stable groovy release version 2013-07-22 15:53:38 +02:00
Lukas Bulwahn c94e6cb99e catkin: make RDEPENDS more precise (resolves #119) 2013-07-22 15:47:53 +02:00
Lukas Bulwahn 1fa437d8a4 catkin: improving dependencies (resolves #113) 2013-07-15 07:18:33 +02:00
Lukas Bulwahn a3f3d7dcd2 catkin: adjustment for native recipe (cf. discussion #101)
The native catkin recipe has no runtime dependency on
the native version of packagegroup-core-buildessential.
2013-07-01 10:45:01 +02:00
Lukas Bulwahn da4e9d5fb5 catkin: adding python-misc as runtime dependency
The catkin scripts require the ast python module, which is shipped
with python-misc.
2013-06-28 10:47:44 +02:00
Lukas Bulwahn 8b8ad00fe4 catkin: adding runtime dependencies on needed build tools
catkin is a build tool based on cmake and requires the common
build tools to work properly.
2013-06-28 10:47:44 +02:00
Lukas Bulwahn 86944220a5 catkin: adding runtime dependencies on python modules
The catkin_make command requires a number of python modules.
2013-06-28 10:47:44 +02:00
Lukas Bulwahn 831cf25854 catkin: improving runtime dependency 2013-04-10 07:16:09 +02:00
Lukas Bulwahn 1f1280b130 catkin: adding runtime dependency 2013-04-04 13:05:16 +02:00
Stefan Herbrechtsmeier 2c94b2a015 catkin: Update to upstream head
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
2013-03-14 11:36:55 +01:00
Stefan Herbrechtsmeier fc3c29f5d8 catkin: Add patch to don't require .catkin file
Catkin require a .catkin file in all CMAKE_PREFIX_PATH to add them
to the CATKIN_WORKSPACES. Remove this requirement as it couldn't
be satisfy when catkin packages are installed into the common usr
prefix. Without this adaption catkin couldn't find all files.

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
2013-03-14 10:06:46 +01:00