]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
build: Remove old ceph-libboost* packages in install-deps 52769/head
authorAdam Emerson <aemerson@redhat.com>
Wed, 19 Jul 2023 21:12:08 +0000 (17:12 -0400)
committerAdam Emerson <aemerson@redhat.com>
Thu, 3 Aug 2023 14:14:35 +0000 (10:14 -0400)
commitea5deb26690de389e78ee3ecf9d80ac69cb64d63
treeb1341c3bb40d36c86c3691d295b12700f0e89b1f
parent141d30dd0cfc1a5d03cbcad973791fb755fde0b1
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 Reef than Squid
 - ci_debug does not exist in Reef
 - No INSTALL_EXTRA

Signed-off-by: Adam Emerson <aemerson@redhat.com>
install-deps.sh