]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
build: Remove old ceph-libboost* packages in install-deps
authorAdam Emerson <aemerson@redhat.com>
Wed, 19 Jul 2023 21:12:08 +0000 (17:12 -0400)
committerAdam Emerson <aemerson@redhat.com>
Wed, 2 Aug 2023 16:15:55 +0000 (12:15 -0400)
commit3ac0bf38688f67da90540ce9315b1010e0a49327
tree7f78788d19ccb8ff528e0643b3d8985717048e60
parent8bdc2eecc07dfe11224ff23a8efa73cb8e033019
build: Remove old ceph-libboost* packages in install-deps

Here, we extract `clean_boost_on_ubuntu()` and call it before other
installs on Debian distributions so that if we install a system boost,
a potentially newer `ceph-libboost` won't get in the way.

As the sources.list.d being removed in the original cleanup code isn't
the one we're currently installing in the install code, add a removal
for the currently used source, then do apt-update so packages from the
removed source are no longer included as available.

Two subsidiary dev packages from conflicting boost libraries can be
installed, but it leaves apt in an inconsistent state. To clean this
up, add `--fix-missing` to the removal line and call
`clean_boost_on_ubuntu()` before other uses of apt.

Fixes: https://tracker.ceph.com/issues/62097
Signed-off-by: Adam Emerson <aemerson@redhat.com>
(cherry picked from commit 0c3f511e14af639b6509e69b889258b2f718f8fd)

Conflicts:
install-deps.sh
 - Different boost version for Pacific than Squid.
 - ci_debug does not exist in Pacific
 - whitespace
 - No INSTALL_EXTRA

Fixes: https://tracker.ceph.com/issues/62103
Signed-off-by: Adam Emerson <aemerson@redhat.com>
install-deps.sh