From af43300146811ffe3708891e203c7ac59d8bcc18 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 26 Jan 2021 18:20:45 +0800 Subject: [PATCH] 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 --- install-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 44e404bff49..8db7d2081dd 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 } -- 2.47.3