From 43db21b7cc64c4662f5e9eea9dc5a28ad7c24697 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 21 Jun 2022 23:28:23 +0800 Subject: [PATCH] install-deps.sh: do not install libpmem from chacra this change reverts 17d2bc3707bb0078e2fa1b4eef31b39804e45135, before we recreate a chacra repo hosting libpmem packages, we are not able to query the repo from shaman or pull the dependencies from chacra. in future, we should be able to get the libpmem dependencies from offical ubuntu package repo and fedora, CentOS Stream and RHEL repos. Signed-off-by: Kefu Chai (cherry picked from commit fbfb369722fe9f92ad333f8368095637c36c10ec) --- install-deps.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 6f4cd178fb9..01f883e86b3 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -217,19 +217,6 @@ function install_libzbd_on_ubuntu { libzbd-dev } -function install_libpmem_on_ubuntu { - local codename=$1 - local project=pmem - local sha1=7c18b4b1413ae965ea8bcbfc69eb9784f9212319 - install_pkg_on_ubuntu \ - $project \ - $sha1 \ - $codename \ - check \ - libpmem-dev \ - libpmemobj-dev -} - function version_lt { test $1 != $(echo -e "$1\n$2" | sort -rV | head -n 1) } @@ -305,7 +292,6 @@ else [ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false [ $WITH_JAEGER ] && with_jaeger=true || with_jaeger=false [ $WITH_ZBD ] && with_zbd=true || with_zbd=false - [ $WITH_PMEM ] && with_pmem=true || with_pmem=false source /etc/os-release case "$ID" in debian|ubuntu|devuan|elementary|softiron) @@ -322,7 +308,6 @@ else *Focal*) [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu focal $with_zbd && install_libzbd_on_ubuntu focal - $with_pmem && install_libpmem_on_ubuntu focal ;; *) $SUDO apt-get install -y gcc -- 2.47.3