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

Import Citadel gz packages #168

Merged
merged 7 commits into from
Aug 25, 2022
Merged

Import Citadel gz packages #168

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0688282
Import Citadel gz packages
chapulina Aug 17, 2022
4921fb5
syntax
chapulina Aug 17, 2022
b74510f
syntax
chapulina Aug 17, 2022
707f505
rendering 3.6.0-5
chapulina Aug 17, 2022
86c794e
Update config/ignition_citadel_gazebo11_ubuntu_focal.yaml
j-rivero Aug 18, 2022
adf0dce
Revert changes in Fortress
j-rivero Aug 18, 2022
d70df95
Update math6 version
j-rivero Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 106 additions & 19 deletions config/ignition_citadel_gazebo11_ubuntu_focal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,26 @@ filter_formula: "\
Package (= gazebo11-plugin-base) |\
Package (= libgazebo11) |\
Package (= libgazebo11-dev) \
), $Version (% 11.10.2-1*) |\
(Package (= ignition-citadel) \
), $Version (% 1.0.2-1*) |\
), $Version (% 11.11.0-1*) |\
(Package (= gz-citadel) |\
Package (= ignition-citadel) \
), $Version (% 1.0.2-2*) |\
(Package (= ignition-cmake2) |\
Package (= libgz-cmake2-dev) |\
Package (= libignition-cmake2-dev) \
), $Version (% 2.12.1-1*) |\
), $Version (% 2.14.0-2*) |\
(Package (= ignition-common3) |\
Package (= libgz-common3) |\
Package (= libgz-common3-av) |\
Package (= libgz-common3-av-dev) |\
Package (= libgz-common3-core-dev) |\
Package (= libgz-common3-dev) |\
Package (= libgz-common3-events) |\
Package (= libgz-common3-events-dev) |\
Package (= libgz-common3-graphics) |\
Package (= libgz-common3-graphics-dev) |\
Package (= libgz-common3-profiler) |\
Package (= libgz-common3-profiler-dev) |\
Package (= libignition-common3) |\
Package (= libignition-common3-av) |\
Package (= libignition-common3-av-dev) |\
Expand All @@ -29,38 +42,67 @@ filter_formula: "\
Package (= libignition-common3-graphics-dev) |\
Package (= libignition-common3-profiler) |\
Package (= libignition-common3-profiler-dev) \
), $Version (% 3.14.0-1*) |\
), $Version (% 3.14.2-1*) |\
(Package (= ignition-fuel-tools4) |\
Package (= libgz-fuel-tools4) |\
Package (= libgz-fuel-tools4-dev) |\
Package (= libignition-fuel-tools4) |\
Package (= libignition-fuel-tools4-dev) \
), $Version (% 4.4.0-1*) |\
), $Version (% 4.6.0-1*) |\
(Package (= ignition-gazebo3) |\
Package (= libgz-sim3) |\
Package (= libgz-sim3-dbg) |\
Package (= libgz-sim3-dev) |\
Package (= libgz-sim3-plugins) |\
Package (= libignition-gazebo3) |\
Package (= libignition-gazebo3-dbg) |\
Package (= libignition-gazebo3-dev) |\
Package (= libignition-gazebo3-plugins) \
), $Version (% 3.13.0-1*) |\
), $Version (% 3.14.0-1*) |\
(Package (= ignition-gui3) |\
Package (= libgz-gui3) |\
Package (= libgz-gui3-dev) |\
Package (= libignition-gui3) |\
Package (= libignition-gui3-dev) \
), $Version (% 3.9.0-1*) |\
), $Version (% 3.11.2-1*) |\
(Package (= ignition-launch2) |\
Package (= libgz-launch2) |\
Package (= libgz-launch2-dev) |\
Package (= libignition-launch2) |\
Package (= libignition-launch2-dev) \
), $Version (% 2.2.2-1*) |\
), $Version (% 2.3.0-1*) |\
(Package (= ignition-math6) |\
Package (= libgz-math6) |\
Package (= libgz-math6-dbg) |\
Package (= libgz-math6-dev) |\
Package (= libgz-math6-eigen3-dev) |\
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Package (= libgz-math6-eigen3-dev) |\
Package (= libgz-math6-eigen-dev) |\

According to the introspection performed by the generator script there is no package named libgz-math6-eigen3-dev but the libignition-math6-eigen3-dev package does use eigen3 instead of eigen. @j-rivero do you know if this is a typo / omission or if the plan is to rename the libgz... package?

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 thought I had fixed that

gazebo-release/gz-math6-release@3b85559

Copy link
Contributor

Choose a reason for hiding this comment

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

yep, eigen3 should be used.

Copy link
Contributor

Choose a reason for hiding this comment

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

The generator script is still finding the bare eigen package name on Focal. Looking at the package pool it appears that only jammy has the corrected package name.
eigen

Package (= libignition-math6) |\
Package (= libignition-math6-dbg) |\
Package (= libignition-math6-dev) |\
Package (= libignition-math6-eigen3-dev) |\
Package (= python3-gz-math6) |\
Package (= python3-ignition-math6) |\
Package (= ruby-gz-math6) |\
Package (= ruby-ignition-math6) \
), $Version (% 6.10.0-1*) |\
), $Version (% 6.12.0-3*) |\
(Package (= ignition-msgs5) |\
Package (= libgz-msgs5) |\
Package (= libgz-msgs5-dev) |\
Package (= libignition-msgs5) |\
Package (= libignition-msgs5-dev) \
), $Version (% 5.9.0-1*) |\
), $Version (% 5.10.0-4*) |\
(Package (= ignition-physics2) |\
Package (= libgz-physics2) |\
Package (= libgz-physics2-core-dev) |\
Package (= libgz-physics2-dartsim) |\
Package (= libgz-physics2-dartsim-dev) |\
Package (= libgz-physics2-dev) |\
Package (= libgz-physics2-mesh-dev) |\
Package (= libgz-physics2-sdf-dev) |\
Package (= libgz-physics2-tpe) |\
Package (= libgz-physics2-tpe-dev) |\
Package (= libgz-physics2-tpelib) |\
Package (= libgz-physics2-tpelib-dev) |\
Package (= libignition-physics2) |\
Package (= libignition-physics2-core-dev) |\
Package (= libignition-physics2-dartsim) |\
Expand All @@ -72,22 +114,59 @@ filter_formula: "\
Package (= libignition-physics2-tpe-dev) |\
Package (= libignition-physics2-tpelib) |\
Package (= libignition-physics2-tpelib-dev) \
), $Version (% 2.5.0-1*) |\
), $Version (% 2.5.1-1*) |\
(Package (= ignition-plugin) |\
Package (= libgz-plugin) |\
Package (= libgz-plugin-dbg) |\
Package (= libgz-plugin-dev) |\
Package (= libignition-plugin) |\
Package (= libignition-plugin-dbg) |\
Package (= libignition-plugin-dev) \
), $Version (% 1.2.1-1*) |\
), $Version (% 1.3.0-1*) |\
(Package (= ignition-rendering3) |\
Package (= libgz-rendering3) |\
Package (= libgz-rendering3-core-dev) |\
Package (= libgz-rendering3-dev) |\
Package (= libgz-rendering3-ogre1) |\
Package (= libgz-rendering3-ogre1-dev) |\
Package (= libgz-rendering3-ogre2) |\
Package (= libgz-rendering3-ogre2-dev) |\
Package (= libignition-rendering3) |\
Package (= libignition-rendering3-core-dev) |\
Package (= libignition-rendering3-dev) |\
Package (= libignition-rendering3-ogre1) |\
Package (= libignition-rendering3-ogre1-dev) |\
Package (= libignition-rendering3-ogre2) |\
Package (= libignition-rendering3-ogre2-dev) \
), $Version (% 3.6.0-1*) |\
), $Version (% 3.6.0-5*) |\
(Package (= ignition-sensors3) |\
Package (= libgz-sensors3) |\
Package (= libgz-sensors3-air-pressure) |\
Package (= libgz-sensors3-air-pressure-dev) |\
Package (= libgz-sensors3-altimeter) |\
Package (= libgz-sensors3-altimeter-dev) |\
Package (= libgz-sensors3-camera) |\
Package (= libgz-sensors3-camera-dev) |\
Package (= libgz-sensors3-core-dev) |\
Package (= libgz-sensors3-depth-camera) |\
Package (= libgz-sensors3-depth-camera-dev) |\
Package (= libgz-sensors3-dev) |\
Package (= libgz-sensors3-gpu-lidar) |\
Package (= libgz-sensors3-gpu-lidar-dev) |\
Package (= libgz-sensors3-imu) |\
Package (= libgz-sensors3-imu-dev) |\
Package (= libgz-sensors3-lidar) |\
Package (= libgz-sensors3-lidar-dev) |\
Package (= libgz-sensors3-logical-camera) |\
Package (= libgz-sensors3-logical-camera-dev) |\
Package (= libgz-sensors3-magnetometer) |\
Package (= libgz-sensors3-magnetometer-dev) |\
Package (= libgz-sensors3-rendering) |\
Package (= libgz-sensors3-rendering-dev) |\
Package (= libgz-sensors3-rgbd-camera) |\
Package (= libgz-sensors3-rgbd-camera-dev) |\
Package (= libgz-sensors3-thermal-camera) |\
Package (= libgz-sensors3-thermal-camera-dev) |\
Package (= libignition-sensors3) |\
Package (= libignition-sensors3-air-pressure) |\
Package (= libignition-sensors3-air-pressure-dev) |\
Expand Down Expand Up @@ -115,18 +194,26 @@ filter_formula: "\
Package (= libignition-sensors3-rgbd-camera-dev) |\
Package (= libignition-sensors3-thermal-camera) |\
Package (= libignition-sensors3-thermal-camera-dev) \
), $Version (% 3.3.0-1*) |\
(Package (= ignition-tools) |\
), $Version (% 3.4.0-1*) |\
(Package (= gz-tools) |\
Package (= ignition-tools) |\
Package (= libgz-tools-dev) |\
Package (= libignition-tools-dev) \
), $Version (% 1.4.1-1*) |\
), $Version (% 1.5.0-1*) |\
(Package (= ignition-transport8) |\
Package (= libgz-transport8) |\
Package (= libgz-transport8-core-dev) |\
Package (= libgz-transport8-dbg) |\
Package (= libgz-transport8-dev) |\
Package (= libgz-transport8-log) |\
Package (= libgz-transport8-log-dev) |\
Package (= libignition-transport8) |\
Package (= libignition-transport8-core-dev) |\
Package (= libignition-transport8-dbg) |\
Package (= libignition-transport8-dev) |\
Package (= libignition-transport8-log) |\
Package (= libignition-transport8-log-dev) \
), $Version (% 8.2.1-1*) |\
), $Version (% 8.3.0-2*) |\
(Package (= ogre-2.1) |\
Package (= blender-ogrexml-2.1) |\
Package (= libogre-2.1) |\
Expand All @@ -140,5 +227,5 @@ filter_formula: "\
Package (= libsdformat9-dev) |\
Package (= sdformat9-doc) |\
Package (= sdformat9-sdf) \
), $Version (% 9.7.0-1*) \
), $Version (% 9.8.0-1*) \
"