Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import upstream-able changes from lgsvl/meta-ros2 fork #607

Merged
merged 10 commits into from
Oct 4, 2018
Merged

Import upstream-able changes from lgsvl/meta-ros2 fork #607

merged 10 commits into from
Oct 4, 2018

Conversation

shr-project
Copy link
Contributor

This brings in changes from #538 together with additional updates and fixes from https://github.com/lgsvl/meta-ros2/commits/ros2pr

shr-project
shr-project commented Aug 7, 2018
View reviewed changes
README.md
meta-python since pyro
1a373a033f482981eb59ff8d9eb7a9437fa18cd4@meta-openembedded and native
version since rocko
06eb9d658e71b6a61f2589d9618ae2ca35eaaf8b@meta-openembedded
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll extend this comment a bit, because python3-pyparsing-native depends on python3-datetime-native, python3-debugger-native and python3-stringold-native which were added in oe-core python3-native in pyro:
462ccb35a5de32b52ddb733d1868df6ac5426f20@openembedded-core and 800753069f667cd1664d70b3779150c467e3b3fe@openembedded-core

Basically this .bbappend:

# backport from oe-core 462ccb35a5de32b52ddb733d1868df6ac5426f20
# needed for python3-pyparsing-native

RPROVIDES += "\
    python3-datetime-native \
    python3-enum-native \
    python3-terminal-native \
"

# and from oe-core 800753069f667cd1664d70b3779150c467e3b3fe
RPROVIDES += "\
    python3-debugger-native \
    python3-stringold-native \
"

shr-project
shr-project commented Aug 7, 2018
View reviewed changes
Copy link
Contributor Author

@shr-project shr-project left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update again.

This was referenced Aug 24, 2018
Merged
Closed
@rojkov
Copy link
Contributor

rojkov commented Aug 24, 2018

@bulwahn Ping. I don't have strong opinion on ROS2 recipes. Do you mind accepting them?

@shr-project Could you please send ROS1 related updates as a separate PR?

@shr-project
Copy link
Contributor Author

shr-project commented Aug 24, 2018 •
edited
Loading

@rojkov ok, I've moved 5 ros1 related commits to #608

Just be aware that CI build will now fail on sphinx, because of missing dependency with current oe-core.

@shr-project shr-project deleted the jansa/lgsvl branch August 28, 2018 09:34
@shr-project shr-project restored the jansa/lgsvl branch August 28, 2018 11:43
@shr-project shr-project reopened this Aug 28, 2018
flowergom pushed a commit to webosose/meta-webosose that referenced this pull request Sep 20, 2018
@shr-project
python3-pyparsing,python3-pyyaml,python-pycrypto: backports for meta-ros
cae2ef3 
:Release Notes:
To be able to use upstream meta-ros as in PR:
ros/meta-ros#607

:Detailed Notes:
python-pycrypto is used by python-paramiko which in turn is used by
roslaunch. Add it from Yocto 2.5 Sumo, because it has python3-pycrypto
which is used by python3-paramiko as well. And as a bonus fix for
CVE-2013-7459

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-64986] [OSE] CCC: Various build issues
@rojkov
Copy link
Contributor

rojkov commented Sep 28, 2018

@bulwahn Last Call: I'm going to merge this PR by the end of next week.

Dmitry Rozhkov and others added 10 commits October 1, 2018 14:27
@shr-project
ros2: add initial recipes
1de0257 
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project
packagegroup-ros-world: add ros2 recipes
48f7d25 
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project
fastrtps: fix tinyxml2 library search
6c7ac74 
* fixes rmw-fastrtps-cpp failure:
  http://errors.yoctoproject.org/Errors/Details/174717/

  DEBUG: Executing shell function do_compile
  NOTE: VERBOSE=1 cmake --build TOPDIR/tmp-glibc/work/aarch64-oe-linux/rmw-fastrtps-cpp/git-r0/build --target all -- -j 9
  ninja: error: 'TOPDIR/tmp-glibc/work/aarch64-oe-linux/fastrtps/git-r0/recipe-sysroot/usr/lib/libtinyxml2.so', needed by 'librmw_fastrtps_cpp.so', missing and no known rule to make it
  WARNING: TOPDIR/tmp-glibc/work/aarch64-oe-linux/rmw-fastrtps-cpp/git-r0/temp/run.do_compile.13110:1 exit 1 from 'eval ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build 'TOPDIR/tmp-glibc/work/aarch64-oe-linux/rmw-fastrtps-cpp/git-r0/build' "$@" -- -j 9'
  ERROR: Function failed: do_compile (log file is located at TOPDIR/tmp-glibc/work/aarch64-oe-linux/rmw-fastrtps-cpp/git-r0/temp/log.do_compile.13110)

* it was caused by fastrtps's /usr/lib/fastrtps/cmake/fastrtpsTargets.cmake
  containing the full path to libtinyxml2.so inside fastrtps's WORKDIR
  which might be already removed by rm_work by the time when
  rmw-fastrtps-cpp is being built

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@andre-rosa @shr-project
ros2cli, rosidl-generator-c: Add runtime dependencies on few more pyt…
ebacf5e 
…hon packages

Fixes rosidl:
  ImportError: No module named 'json'
  ImportError: No module named 'em'

Fixes ros2:
  ImportError: No module named 'xmlrpc'
  ImportError: No module named 'pydoc'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@andre-rosa @shr-project
ament.bbclass: Fix wrong suffix 'x86_64-linux-gnu' in native python m…
45de857 
…odule shared library

* Fix wrong suffix x86_64-linux-gnu in native python module shared library

* Python native module shared library is cross-compiled for correct
  architecture but filename had an incorrect suffix 'x86_64-linux-gnu'.

  As per python_cmake_module, if PYTHON_SOABI environment variable is not
  defined, it'll query it from native's python sysconfig module.
  https://github.com/ros2/rosidl/blob/master/python_cmake_module/cmake/Modules/FindPythonExtra.cmake

  So adopt a solution similar to the one adopted below, where PYTHON_SOABI
  is set explicitly for our specific build.
  https://github.com/erlerobot/meta-ros2/blob/master/classes/ament.bbclass

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project
ros2: Update to the latest stable release (release-ardent-20180307)
df0187f 
* Update ROS2 to the latest stable release
  https://github.com/ros2/ros2/blob/release-ardent-20180307/ros2.repos

* Note: some existing ROS1 packages were not updated
  as these could break something in ROS1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project
ros2msg,ros2topic: move msg files to the main package + add ros2-topic
3f4b9ff 
* web-bridge needs msg to generate js bindings on the fly

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project
ros2-launch: add runtime dependency on ${PYTHON_PN}-asyncio
e7faf58 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@eunminlim @shr-project
ros2cli: add new recipes
dbf49d6 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project
ament-cmake-core: Fix the dependency on ${PYTHON_PN}-pyparsing
ea2f01a 
* it actually needs ${PYTHON_PN}-pyparsing-native as shown in
  do_configure failure:

| DEBUG: Executing shell function do_configure
| -- Found PythonInterp: ament-cmake-core/git-r0/recipe-sysroot-native/usr/bin/python3-native/python3 (found suitable version "3.5.2", minimum required is "3")
| -- Using PYTHON_EXECUTABLE: ament-cmake-core/git-r0/recipe-sysroot-native/usr/bin/python3-native/python3
| Error parsing 'ament-cmake-core/git-r0/git/ament_cmake_core/package.xml':
| Traceback (most recent call last):
|   File "ament-cmake-core/git-r0/git/ament_cmake_core/cmake/core/package_xml_2_cmake.py", line 145, in <module>
|     main()
|   File "ament-cmake-core/git-r0/git/ament_cmake_core/cmake/core/package_xml_2_cmake.py", line 56, in main
|     raise e
|   File "ament-cmake-core/git-r0/git/ament_cmake_core/cmake/core/package_xml_2_cmake.py", line 53, in main
|     package = parse_package_string(args.package_xml.read())
|   File "ament-cmake-core/git-r0/recipe-sysroot-native/usr/lib/python3.5/site-packages/ament_package/__init__.py", line 173, in parse_package_string
|     pkg.build_depends = _get_dependencies(root, 'build_depend')
|   File "ament-cmake-core/git-r0/recipe-sysroot-native/usr/lib/python3.5/site-packages/ament_package/__init__.py", line 364, in _get_dependencies
|     from .dependency import Dependency
|   File "ament-cmake-core/git-r0/recipe-sysroot-native/usr/lib/python3.5/site-packages/ament_package/dependency.py", line 15, in <module>
|     from ament_package.condition import evaluate_condition
|   File "ament-cmake-core/git-r0/recipe-sysroot-native/usr/lib/python3.5/site-packages/ament_package/condition.py", line 17, in <module>
|     import pyparsing
| ImportError: No module named 'pyparsing'
| CMake Error at cmake/core/ament_package_xml.cmake:94 (message):

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project
Copy link
Contributor Author

Sorry, I've accidentally added one more commit in this PR (by reusing this old branch), now it's in separate PR #610

@rojkov rojkov merged commit 72068b1 into ros:master Oct 4, 2018
@rojkov rojkov mentioned this pull request Oct 4, 2018
Closed
@shr-project shr-project mentioned this pull request Oct 4, 2018
Merged
@shr-project shr-project deleted the jansa/lgsvl branch January 7, 2020 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@shr-project @rojkov @andre-rosa @eunminlim