From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Tue, 25 Jun 2024 15:10:21 +0000 (+0100)
Subject: Merge pull request #53849 from dvanders/dvanders_alma
X-Git-Tag: v20.0.0~1658
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae0bac968e973fb5181ce31b216a9f4a89d6c4cf;p=ceph.git

Merge pull request #53849 from dvanders/dvanders_alma

install-deps.sh, do_cmake.sh: almalinux is another el flavour

Reviewed-by: John Mulligan <jmulligan@redhat.com>
---

ae0bac968e973fb5181ce31b216a9f4a89d6c4cf
diff --cc do_cmake.sh
index fb66362df0c,c6dbfd10044..50befc81a49
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@@ -19,14 -19,19 +19,14 @@@ if [ -r /etc/os-release ]; the
    source /etc/os-release
    case "$ID" in
        fedora)
 -          if [ "$VERSION_ID" -ge "37" ] ; then
 -            PYBUILD="3.11"
 -          elif [ "$VERSION_ID" -ge "35" ] ; then
 -            PYBUILD="3.10"
 -          elif [ "$VERSION_ID" -ge "33" ] ; then
 -            PYBUILD="3.9"
 -          elif [ "$VERSION_ID" -ge "32" ] ; then
 -            PYBUILD="3.8"
 +          if [ "$VERSION_ID" -ge "39" ] ; then
 +            PYBUILD="3.12"
            else
 -            PYBUILD="3.7"
 +            # Fedora 37 and above
 +            PYBUILD="3.11"
            fi
            ;;
-       rocky|rhel|centos)
+       almalinux|rocky|rhel|centos)
            MAJOR_VER=$(echo "$VERSION_ID" | sed -e 's/\..*$//')
            if [ "$MAJOR_VER" -ge "9" ] ; then
                PYBUILD="3.9"
diff --cc install-deps.sh
index f9138c13845,ba05c26c607..0f112d2d92d
--- a/install-deps.sh
+++ b/install-deps.sh
@@@ -462,8 -507,13 +462,8 @@@ els
          ci_debug "Removing ceph-build-deps"
          $SUDO env DEBIAN_FRONTEND=noninteractive apt-get -y remove ceph-build-deps
          if [ "$control" != "debian/control" ] ; then rm $control; fi
 -
 -        # for rgw motr backend build checks
 -        if $with_rgw_motr; then
 -            install_cortx_motr_on_ubuntu
 -        fi
          ;;
-     rocky|centos|fedora|rhel|ol|virtuozzo)
+     almalinux|rocky|centos|fedora|rhel|ol|virtuozzo)
          builddepcmd="dnf -y builddep --allowerasing"
          echo "Using dnf to install dependencies"
          case "$ID" in