install-deps.sh: install boost-1.72 for bionic

and uninstall boost-1.67 before installing boost-1.72

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d560af7d5c857ffb0228fd71f42d2f6cc0493d64)

Conflicts:
	install-deps.sh: trivial resolution

diff --git a/install-deps.sh b/install-deps.sh
index 8f671db1450a4df695962684685af643d0d9f92e..83114c12a59f4c29f69e431a111b5c04558d7746 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -148,25 +148,33 @@ function install_pkg_on_ubuntu {
 
 function install_boost_on_ubuntu {
     local codename=$1
+    if dpkg -s ceph-libboost1.67-dev &> /dev/null; then
+       $SUDO env DEBIAN_FRONTEND=noninteractive apt-get -y remove 'ceph-libboost.*1.67.*'
+       $SUDO rm /etc/apt/sources.list.d/ceph-libboost1.67.list
+    fi
+    local project=libboost
+    local ver=1.72
+    local sha1=1d7c7a00cc3f37e340bae0360191a757b44ec80c
     install_pkg_on_ubuntu \
-       ceph-libboost1.67 \
-       dd38c27740c1f9a9e6719a07eef84a1369dc168b \
+       $project \
+       $sha1 \
        $codename \
-       ceph-libboost-atomic1.67-dev \
-       ceph-libboost-chrono1.67-dev \
-       ceph-libboost-container1.67-dev \
-       ceph-libboost-context1.67-dev \
-       ceph-libboost-coroutine1.67-dev \
-       ceph-libboost-date-time1.67-dev \
-       ceph-libboost-filesystem1.67-dev \
-       ceph-libboost-iostreams1.67-dev \
-       ceph-libboost-program-options1.67-dev \
-       ceph-libboost-python1.67-dev \
-       ceph-libboost-random1.67-dev \
-       ceph-libboost-regex1.67-dev \
-       ceph-libboost-system1.67-dev \
-       ceph-libboost-thread1.67-dev \
-       ceph-libboost-timer1.67-dev
+       ceph-libboost-atomic$ver-dev \
+       ceph-libboost-chrono$ver-dev \
+       ceph-libboost-container$ver-dev \
+       ceph-libboost-context$ver-dev \
+       ceph-libboost-coroutine$ver-dev \
+       ceph-libboost-date-time$ver-dev \
+       ceph-libboost-filesystem$ver-dev \
+       ceph-libboost-iostreams$ver-dev \
+       ceph-libboost-program-options$ver-dev \
+       ceph-libboost-python$ver-dev \
+       ceph-libboost-random$ver-dev \
+       ceph-libboost-regex$ver-dev \
+       ceph-libboost-system$ver-dev \
+       ceph-libboost-test$ver-dev \
+       ceph-libboost-thread$ver-dev \
+       ceph-libboost-timer$ver-dev
 }
 
 function version_lt {