diff options
| author | Pere Diaz Bou <pere-altea@hotmail.com> | 2024-01-04 14:30:31 +0100 |
|---|---|---|
| committer | Pere Diaz Bou <pere-altea@hotmail.com> | 2024-01-09 23:08:05 +0100 |
| commit | 03e11acca048a43ce183be68a5db1c039b7ca485 (patch) | |
| tree | ab9458f132684977387a914713710f3c678ce509 /install-deps.sh | |
| parent | os/bluestore: remove zoned namespace support (diff) | |
| download | ceph-03e11acca048a43ce183be68a5db1c039b7ca485.tar.xz ceph-03e11acca048a43ce183be68a5db1c039b7ca485.zip | |
os/bluestore: remove zoned from crimson
Signed-off-by: Pere Diaz Bou <pere-altea@hotmail.com>
Diffstat (limited to 'install-deps.sh')
| -rwxr-xr-x | install-deps.sh | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/install-deps.sh b/install-deps.sh index d01bc6464e6..5956b586e52 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -36,8 +36,6 @@ ARCH=$(uname -m) function munge_ceph_spec_in { local with_seastar=$1 shift - local with_zbd=$1 - shift local for_make_check=$1 shift local OUTFILE=$1 @@ -46,9 +44,6 @@ function munge_ceph_spec_in { if $with_seastar; then sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE fi - if $with_zbd; then - sed -i -e 's/%bcond_with zbd/%bcond_without zbd/g' $OUTFILE - fi if $for_make_check; then sed -i -e 's/%bcond_with make_check/%bcond_without make_check/g' $OUTFILE fi @@ -221,19 +216,6 @@ function install_boost_on_ubuntu { } -function install_libzbd_on_ubuntu { - ci_debug "Running install_libzbd_on_ubuntu() in install-deps.sh" - local codename=$1 - local project=libzbd - local sha1=1fadde94b08fab574b17637c2bebd2b1e7f9127b - install_pkg_on_ubuntu \ - $project \ - $sha1 \ - $codename \ - check \ - libzbd-dev -} - motr_pkgs_url='https://github.com/Seagate/cortx-motr/releases/download/2.0.0-rgw' function install_cortx_motr_on_ubuntu { @@ -423,7 +405,6 @@ if [ x$(uname)x = xFreeBSDx ]; then exit else [ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false - [ $WITH_ZBD ] && with_zbd=true || with_zbd=false [ $WITH_PMEM ] && with_pmem=true || with_pmem=false [ $WITH_RADOSGW_MOTR ] && with_rgw_motr=true || with_rgw_motr=false source /etc/os-release @@ -452,12 +433,10 @@ else *Bionic*) ensure_decent_gcc_on_ubuntu 9 bionic [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu bionic - $with_zbd && install_libzbd_on_ubuntu bionic ;; *Focal*) ensure_decent_gcc_on_ubuntu 11 focal [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu focal - $with_zbd && install_libzbd_on_ubuntu focal ;; *Jammy*) [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu jammy @@ -549,7 +528,7 @@ else if [ "$INSTALL_EXTRA_PACKAGES" ]; then $SUDO dnf install -y $INSTALL_EXTRA_PACKAGES fi - munge_ceph_spec_in $with_seastar $with_zbd $for_make_check $DIR/ceph.spec + munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec # for python3_pkgversion macro defined by python-srpm-macros, which is required by python3-devel $SUDO dnf install -y python3-devel $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out |