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

Signed-off-by: Dan van der Ster <dan.vanderster@clyso.com>
(cherry picked from commit 6e85f76385c3cffd860a8a3054bf14ce85a43b59)

Conflicts:
	do_cmake.sh add rocky too
	install-deps.sh add rocky too

diff --git a/do_cmake.sh b/do_cmake.sh
index 3eb9b08d8afd95531e26aae2f954690afffd0c0d..415a9491c3dc3e0c73e2d6c757cf2748e66a51e9 100755 (executable)
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@ -29,7 +29,7 @@ if [ -r /etc/os-release ]; then
             PYBUILD="3.7"
           fi
           ;;
-      rhel|centos)
+      almalinux|rocky|rhel|centos)
           MAJOR_VER=$(echo "$VERSION_ID" | sed -e 's/\..*$//')
           if [ "$MAJOR_VER" -ge "9" ] ; then
               PYBUILD="3.9"

diff --git a/install-deps.sh b/install-deps.sh
index 6b43679ae8966ec3bc6c719acaa9c97984801d68..006356b276b8ed90381f48de44342a44a015012c 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -403,14 +403,14 @@ else
        $SUDO env DEBIAN_FRONTEND=noninteractive apt-get -y remove ceph-build-deps
        if [ "$control" != "debian/control" ] ; then rm $control; fi
         ;;
-    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
             fedora)
                 $SUDO dnf install -y dnf-utils
                 ;;
-            centos|rhel|ol|virtuozzo)
+            almalinux|rocky|centos|rhel|ol|virtuozzo)
                 MAJOR_VERSION="$(echo $VERSION_ID | cut -d. -f1)"
                 $SUDO dnf install -y dnf-utils selinux-policy-targeted
                 rpm --quiet --query epel-release || \