-
Notifications
You must be signed in to change notification settings - Fork 279
Vermaete/master rolling 2025 12 04 #1630
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.
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
Open
vermaete
wants to merge
41
commits into
ros:master
Choose a base branch
from
vermaete:vermaete/master_rolling_2025-12-04
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+35,332
−32,840
Open
Changes from 29 commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
05dabb0
{rolling} Update cache.yaml and rosdep files for rolling release 2025…
robwoolley b395293
{rolling} Sync to files/rolling/generated/cache.yaml as of 2025120416…
robwoolley 35e8f4c
{rolling} Rename bbappends to match new versions
robwoolley c804dc7
{rolling}: replace ${PYTHON_PN} by python3
vermaete d8ffed0
[master] {rolling}: removed duplicated LICENSE variable in bbappends
vermaete a2f5cd8
{common}: adding ros-image-desktop and ros-image-desktopfull
vermaete 588a954
python3-fastapi: recipe moved to meta-python
vermaete d5d9dba
[master]{rolling}: add osrf-pycommon to ros-distro.inc
vermaete 254ff1e
[master]{rolling}: removed not longer used ROS_UNRESOVED_DEP-
vermaete ca56e1a
{common}: replace ${PYTHON_PN} by python3
vermaete 4f63b33
{rolling} python3-humanfriendly: remove bbappend file
vermaete a92447b
{common} libtinyxml2: remove the bbappend file
vermaete 3879656
{rolling} python3-psutil: remove bbappend file
vermaete cb4d4f5
{rolling} python3-dateutil: remove the bbappend file
vermaete b413bf9
{common} python3-coloredlogs: remove the bbappend file
vermaete 6923fe1
{common} python3-docutils: remove bbappend file
vermaete a119157
{common} sphinx: removed not longer used inc file
vermaete b071394
[master]{rolling} fastdds: remove applied backport patch
vermaete 7a730f2
{rolling} zenoh-cpp-vendor: update of the patch
vermaete af9e2a3
{common} python3-pyproj: BBCLASSEXTEND native is already in bb file
vermaete 8a6c9e6
{common} ffmpeg: remove duplicated bbappend file
vermaete e07a091
{common} libtheora: remove duplicated bbappend file
vermaete b56a748
{common} asio: remove bbappend
vermaete 07fe01b
{common} gz-cmake5: added version 5.0.0
vermaete 267fd2a
{common} gz-cmake-vendor: Major version is dropped from gz packages
vermaete 5a1d422
{common} gz-math: added 9.0.0 version
vermaete f8f25eb
{common} gz-utils-vendor: depends on gz-utils4
vermaete 86f7d26
{common} gz-math-vendor: depends on gz-math9
vermaete 5c3c383
WIP [master]{common} python3-pydocstyle: version bump 2.0.0 -> 6.3.0
vermaete-oip b28854b
[master]{rolling} rmw-dds-common: rosidl-runtime-py added
vermaete e776092
[master]{rolling}gz-utils-vendor: remove cli11 from RDEPENDS
vermaete 50b1846
[master] python3-flake8-deprecated: version bump 2.2.1 -> 2.3.0
vermaete 3e8beea
[master]{rolling} ament-xmllint: xmllint was missing
vermaete 507ba8a
[master]{meta-ros2}python3-flake8-blind-except: fix the recipe
vermaete 15837ad
[master]{meta-ros2}python3-flake8-class-newline: fixed recipe
vermaete 561f7cb
[mater]{rolling}zziplib: defining the ROS_UNRESOLVED_DEP is not longe…
vermaete 45a2e04
[master]{rolling}: ros-distro.inc: remove ROS_UNRESOLVED_DEP-python3-…
vermaete 27d4f2d
[master]{rolling}ros-distro.inc: remove duplicate entries from ROS_SU…
vermaete 2cfbb77
[master]{rolling}ros-distro: added rosidl-runtime-py-native as buildtool
vermaete 5a728ba
WIP [master]{rolling}amment-xmllint: fetch the schema with wget
vermaete 46c1589
WIP [master]{meta-ros2} ros-ptest-python-pytest.bbclass
vermaete File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| require ${COREBASE}/meta/recipes-graphics/images/core-image-x11.bb | ||
|
|
||
| SUMMARY = "Desktop image of ROS 2" | ||
| DESCRIPTION = "The desktop variant provides all commonly used libraries as well as visualization tools and tutorials." | ||
| HOMEPAGE = "https://www.ros.org/reps/rep-2001.html" | ||
|
|
||
| inherit ros_distro_${ROS_DISTRO} | ||
| inherit ${ROS_DISTRO_TYPE}_image | ||
|
|
||
| IMAGE_INSTALL:append = " \ | ||
| desktop \ | ||
| " |
12 changes: 12 additions & 0 deletions
12
meta-ros-common/recipes-core/images/ros-image-desktopfull.bb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| require ${COREBASE}/meta/recipes-graphics/images/core-image-x11.bb | ||
|
|
||
| SUMMARY = "Desktop Full image of ROS 2" | ||
| DESCRIPTION = "The desktop_full variant provides a "batteries included" experience, enabling novice users to complete most entry tutorials without knowledge of the underlying library structure." | ||
| HOMEPAGE = "https://www.ros.org/reps/rep-2001.html" | ||
|
|
||
| inherit ros_distro_${ROS_DISTRO} | ||
| inherit ${ROS_DISTRO_TYPE}_image | ||
|
|
||
| IMAGE_INSTALL:append = " \ | ||
| desktop-full \ | ||
| " |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
meta-ros-common/recipes-devtools/gazebo/gz-cmake5/Fix-pkgconfig-install-dir.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
|
|
||
| Fix pkgconfig installation directory | ||
|
|
||
| Packages which use gz-cmake3 will fail to install when | ||
| building cross-platform and CMAKE_INSTALL_PREFIX is set. | ||
|
|
||
| This happens because pkgconfig_install_dir uses | ||
| CMAKE_INSTALL_FULL_LIBDIR/pkgconfig which is an absolute path. | ||
|
|
||
| We should use CMAKE_INSTALL_LIBDIR instead so that it is a | ||
| relative path and CMAKE_INSTALL_PREFIX can be used. | ||
|
|
||
| Upstream-Status: Inappropriate [oe specific] | ||
|
|
||
| Signed-off by: Rob Woolley <rob.woolley@windriver.com> | ||
|
|
||
| diff --git a/cmake/GzPackaging.cmake b/cmake/GzPackaging.cmake | ||
| index f3a8ae0..4a2b633 100644 | ||
| --- a/cmake/GzPackaging.cmake | ||
| +++ b/cmake/GzPackaging.cmake | ||
| @@ -227,7 +227,7 @@ function(_gz_create_pkgconfig) | ||
|
|
||
| install( | ||
| FILES ${pkgconfig_output} | ||
| - DESTINATION ${pkgconfig_install_dir} | ||
| + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" | ||
| COMPONENT pkgconfig) | ||
|
|
||
| endfunction() |
23 changes: 23 additions & 0 deletions
23
meta-ros-common/recipes-devtools/gazebo/gz-cmake5_5.0.0.bb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # Copyright (c) 2024 Wind River Systems, Inc. | ||
| SUMMARY = "A set of CMake modules that are used by the C++-based Gazebo projects" | ||
| HOMEPAGE = "https://gazebosim.org/libs/cmake/" | ||
| LICENSE = "Apache-2.0" | ||
| LIC_FILES_CHKSUM = "file://LICENSE;md5=2a461be67a1edf991251f85f3aadd1d0" | ||
|
|
||
| SRC_URI = "git://github.com/gazebosim/gz-cmake.git;protocol=https;branch=gz-cmake5 \ | ||
| file://Fix-pkgconfig-install-dir.patch" | ||
|
|
||
| SRCREV = "891a912f35ea050d5238f6ff0f952a5954eb7e23" | ||
|
|
||
| inherit cmake | ||
|
|
||
| FILES:${PN} += "${datadir}/gz/gz-cmake/*" | ||
|
|
||
| FILES:${PN}-dev += "\ | ||
| pkgconfig/gz-cmake5.pc \ | ||
| ${includedir} \ | ||
| ${datadir}/cmake/gz-cmake/cmake/ \ | ||
| ${datadir}/gz/gz-cmake/ \ | ||
| " | ||
|
|
||
| BBCLASSEXTEND = "native nativesdk" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # Copyright (c) 2024 Wind River Systems, Inc. | ||
| SUMMARY = "General purpose math library for robot applications" | ||
| HOMEPAGE = "https://gazebosim.org/libs/math/" | ||
| LICENSE = "Apache-2.0" | ||
| LIC_FILES_CHKSUM = "file://LICENSE;md5=2a461be67a1edf991251f85f3aadd1d0" | ||
|
|
||
| SRC_URI = "git://github.com/gazebosim/gz-math.git;protocol=https;branch=${BPN}" | ||
|
|
||
| SRCREV = "31dda2d7f1fa399b1e270db2770c33fc0c6dc7bf" | ||
|
|
||
| DEPENDS = " \ | ||
| gz-cmake5 \ | ||
| gz-cmake5-native \ | ||
| gz-utils4 \ | ||
| libeigen \ | ||
| python3 \ | ||
| python3-pybind11 \ | ||
| ruby \ | ||
| swig-native \ | ||
| " | ||
|
|
||
| inherit cmake python3targetconfig | ||
|
|
||
| FILES:${PN} += "${libdir}/python/" | ||
|
|
||
| BBCLASSEXTEND = "native nativesdk" |
17 changes: 17 additions & 0 deletions
17
meta-ros-common/recipes-devtools/gazebo/gz-utils4_4.0.0.bb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # Copyright (c) 2024 Wind River Systems, Inc. | ||
| SUMMARY = "Classes and functions for robot applications" | ||
| DESCRIPTION = "Gazebo Utils, a component of Gazebo, provides general purpose classes and functions designed for robotic applications." | ||
| HOMEPAGE = "https://gazebosim.org/libs/utils/" | ||
| LICENSE = "Apache-2.0" | ||
| LIC_FILES_CHKSUM = "file://LICENSE;md5=388d6baacb3a7c79a82bd82a679c65f3 \ | ||
| file://cli/LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" | ||
|
|
||
| DEPENDS = "cli11 gz-cmake5 spdlog" | ||
|
|
||
| SRC_URI = "git://github.com/gazebosim/gz-utils.git;protocol=https;branch=${BPN}" | ||
|
|
||
| SRCREV = "27bc661ba65a9274e232ce3ff38b92efad27138e" | ||
|
|
||
| inherit cmake | ||
|
|
||
| BBCLASSEXTEND = "native nativesdk" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @vermaete. Thanks for keeping this going. I have been thinking about what the right thing to do is for the desktop image recipe. I would like to define what it is independently from the desktop and desktop-full image variants. I feel that ros-image-desktop should have everything that a user may expect. So I'm leaning to making desktop-full the dependency for it. I would also expect it to automatically boot right into the desktop. For rolling it should also be using Qt6 with hardware acceleration to ensure that Gazebo and RViz are running optimally.
I'm going to skip this commit in this series, but I'd like to keep working on this and help you out with it however I can.