]> 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>
Mon, 31 Jul 2023 15:55:04 +0000 (11:55 -0400)
commitc1c97e623d8eeb38a532d9f3a858da210df044e5
treea162a5816fda743973f88e5c84b7aee112eb570a
parent6e26ecceb84bd481a9301eb10c077bd79a8a0852
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 Quincy than Squid.
 - ci_debug does not exist in Quincy
 - whitespace
 - No INSTALL_EXTRA

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