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.

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

Consistently use importdir as patch location #128

Merged
merged 1 commit into from
Sep 8, 2024
Merged

Conversation

planthaber
Copy link
Member

We are using autoproj/autobuild to organize our ROS2 workspaces (for aup/osdeps).
Often ROS2 repos contain several packages instead of only one.

We (hackily) archieve the compatibility of these packages by setting a common importdir and defining interactive: true
in the source.yml to prevent parallel checkouts into the same folder.

But patching these packages fails because autobuild places the patches in the importdir, but then searches for them in the srcdir, which is not the same in our case.

This PR fixes the behavior by consistently using the importdir as patch location.

For more information about the multi-package repo handling we are using:

The complete package_set (work in progress) :https://github.com/dfki-ric/ros2-package_set
Package definition: https://github.com/dfki-ric/ros2-package_set/blob/master/ros-2.autobuild#L21-L22
Source definition: https://github.com/dfki-ric/ros2-package_set/blob/master/source.yml#L85-L87
Package Type Definition: https://github.com/dfki-ric/ros2-package_set/blob/master/lib/colcon_package.rb

FYI: There is also support for the import of rock packages and generic libs into the colcon workspace to be directly build with colcon (set up pkg-config, generate package.xml, setting cmake_args from the autobuild file)

@planthaber planthaber requested a review from doudou June 12, 2024 09:52
@doudou
Copy link
Member

doudou commented Jul 19, 2024

Could you add a line that runs git config --global protocol.file.allow always in the test action ? It seems to be needed now for the suite to pass ... New versions of git.

@g-arjones
Copy link
Contributor

@doudou I've done that recently: 195011f

@doudou doudou merged commit dd2d426 into master Sep 8, 2024
6 checks passed
@planthaber
Copy link
Member Author

Thanks, missed the notification of your reply :-(

@doudou doudou deleted the patch_importdir branch September 10, 2024 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants