From: Kefu Chai <kchai@redhat.com>
Date: Tue, 26 Jan 2021 10:20:45 +0000 (+0800)
Subject: install-deps.sh: set codename when installing libzbd
X-Git-Tag: v16.2.0~242^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fc8023a66a89062a53c357d27ab900fc376e97d;p=ceph.git

install-deps.sh: set codename when installing libzbd

this was an oversight in e7e3b86762ff3fccdae21e713c64215ab3bb7bb4

also use updated build with sha1 of
1fadde94b08fab574b17637c2bebd2b1e7f9127b, the older version has an issue
where both libzbd and libzbd-dev packaged .pc file with the same path,
so they conflicted with each other. the new version addressed this
issue.

and install libzbd-dev instead of libzbd and libzbd-dev, as the package
name of the former could change if its so version is bumped, so use the
*-dev package is a safer choice from the perspective of testing the
dev build.

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

diff --git a/install-deps.sh b/install-deps.sh
index 44e404bff49c..8db7d2081ddb 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -206,14 +206,14 @@ function install_boost_on_ubuntu {
 }
 
 function install_libzbd_on_ubuntu {
+    local codename=$1
     local project=libzbd
-    local sha1=44ffc287bf57e17afafec0af4d39b62d4f6c0dac
+    local sha1=1fadde94b08fab574b17637c2bebd2b1e7f9127b
     install_pkg_on_ubuntu \
         $project \
         $sha1 \
         $codename \
         check \
-        libzbd \
         libzbd-dev
 }