Skip to content

Commit

Permalink
rosdep keys used by noetic on Ubuntu 22.04 (#33110)
Browse files Browse the repository at this point in the history
* add `libogre` and `libogre-dev` for `jammy`

These are the only two rosdep keys that are missing to run `rosdep` on
`noetic` `desktop-full` on Ubuntu 22.04, as described in the
["Installing from source"](http://wiki.ros.org/noetic/Installation/Source)
tutorial.

* update `liborocos-kdl` for jammy

On Ubuntu 22.04 only version 1.5 of `liborocos-kdl` is available, but
noetic seems to compile fine with this version.

* "disable" `hddtemp` on jammy

On Ubuntu 22.04 `hddtemp` seems to be no longer released (See
[packages.ubuntu.com](https://packages.ubuntu.com/focal/hddtemp), there
is no link to jammy).

Therefore to not run into any issues when using `rosdep` I have disabled
the installation of `hddtemp` for Ubuntu 22.04.

* "disable" `hddtemp` by default

Currently `hddtemp` is only available on `bionic`, `focal` and `impish`.
Since it is unclear whether it will be released in a future version of
Ubuntu the default will now be to disable `hddtemp` on all not
explicitly mentioned releases.

* make `liborocos-kdl1.5` the default for `liborocos-kdl`

Since `liborocos-kdl1.5` will also most likely be the right package in
Ubuntu `kinetic` we make this the default and explicitly mention
`focal` and `impish` for
[`liborocos-kdl1.4`](https://packages.ubuntu.com/focal/liborocos-kdl1.4).

* collapse ubuntu mapping for `libogre[-dev]`

All releases of Ubuntu since xenial use the same package name for
`libogre[-dev]`, therefore we can collapse the mapping.

* collapse ubuntu mapping for `libfltk-dev`

All releases of Ubuntu since xenial use the same package name for
[`libfltk-dev`](https://packages.ubuntu.com/jammy/libfltk1.3-dev),
therefore we can collapse the mapping.
This has the added benefit that this key will also work on `jammy` and
`kinetic`.
  • Loading branch information
dreuter authored May 23, 2022
1 parent df9b88b commit 4f287cd
Showing 1 changed file with 11 additions and 59 deletions.
70 changes: 11 additions & 59 deletions rosdep/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,11 @@ hddtemp:
opensuse: [hddtemp]
rhel: [hddtemp]
slackware: [hddtemp]
ubuntu: [hddtemp]
ubuntu:
"*": null
bionic: [hddtemp]
focal: [hddtemp]
impish: [hddtemp]
hdf5:
arch: [hdf5-cpp-fortran]
debian: [libhdf5-serial-dev]
Expand Down Expand Up @@ -3130,25 +3134,7 @@ libfltk-dev:
opensuse: [fltk-devel]
rhel: [fltk-devel]
slackware: [fltk]
ubuntu:
artful: [libfltk1.3-dev]
bionic: [libfltk1.3-dev]
focal: [libfltk1.3-dev]
lucid: [libfltk1.1-dev]
maverick: [libfltk1.1-dev]
natty: [libfltk1.1-dev]
oneiric: [libfltk1.1-dev]
precise: [libfltk1.1-dev]
quantal: [libfltk1.1-dev]
raring: [libfltk1.1-dev]
saucy: [libfltk1.1-dev]
trusty: [libfltk1.1-dev]
utopic: [libfltk1.3-dev]
vivid: [libfltk1.3-dev]
wily: [libfltk1.3-dev]
xenial: [libfltk1.3-dev]
yakkety: [libfltk1.3-dev]
zesty: [libfltk1.3-dev]
ubuntu: [libfltk1.3-dev]
libfontconfig1-dev:
debian: [libfontconfig1-dev]
fedora: [fontconfig-devel]
Expand Down Expand Up @@ -4114,25 +4100,7 @@ libogre:
openembedded: [ogre@meta-ros-common]
opensuse: [ogre-devel]
slackware: [ogre]
ubuntu:
artful: [libogre-1.9-dev]
bionic: [libogre-1.9.0v5]
focal: [libogre-1.9.0v5]
lucid: [libogre-dev]
maverick: [libogre-dev]
natty: [libogre-dev]
oneiric: [libogre-dev]
precise: [libogre-dev]
quantal: [libogre-dev]
raring: [libogre-dev]
saucy: [libogre-1.8-dev]
trusty: [libogre-1.8-dev]
utopic: [libogre-1.9-dev]
vivid: [libogre-1.9-dev]
wily: [libogre-1.9-dev]
xenial: [libogre-1.9.0v5]
yakkety: [libogre-1.9-dev]
zesty: [libogre-1.9-dev]
ubuntu: [libogre-1.9.0v5]
libogre-dev:
arch: [ogre-1.9]
debian:
Expand All @@ -4148,25 +4116,7 @@ libogre-dev:
openembedded: [ogre@meta-ros-common]
opensuse: [libOgreMain-devel, libOgreOverlay-devel, libOgrePaging-devel, libOgreProperty-devel, libOgreRTShaderSystem-devel, libOgreTerrain-devel, libOgreVolume-devel]
slackware: [ogre]
ubuntu:
artful: [libogre-1.9-dev]
bionic: [libogre-1.9-dev]
focal: [libogre-1.9-dev]
lucid: [libogre-dev]
maverick: [libogre-dev]
natty: [libogre-dev]
oneiric: [libogre-dev]
precise: [libogre-dev]
quantal: [libogre-dev]
raring: [libogre-dev]
saucy: [libogre-1.8-dev]
trusty: [libogre-1.8-dev]
utopic: [libogre-1.9-dev]
vivid: [libogre-1.9-dev]
wily: [libogre-1.9-dev]
xenial: [libogre-1.9-dev]
yakkety: [libogre-1.9-dev]
zesty: [libogre-1.9-dev]
ubuntu: [libogre-1.9-dev]
libois-dev:
arch: [ois]
debian: [libois-dev]
Expand Down Expand Up @@ -4347,8 +4297,10 @@ liborocos-kdl:
'*': [orocos-kdl]
'7': null
ubuntu:
'*': [liborocos-kdl1.4]
'*': [liborocos-kdl1.5]
bionic: [liborocos-kdl1.3]
focal: [liborocos-kdl1.4]
impish: [liborocos-kdl1.4]
xenial: [liborocos-kdl1.3]
liborocos-kdl-dev:
debian: [liborocos-kdl-dev]
Expand Down

0 comments on commit 4f287cd

Please sign in to comment.