Add support for RHEL9 (#808)

Treat Red Hat Enterprise Linux as `slc9` architecture. Update help string and take tarballs from S3 by default on slc9. --------- Co-authored-by: Timo Wilken <[email protected]>
alisw · Oct 18, 2023 · 148fd4b · 148fd4b
1 parent 27e22e5
commit 148fd4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/alibuild_helpers/args.py b/alibuild_helpers/args.py
@@ -341,6 +341,7 @@ def matchValidArch(architecture):
    RHEL6 / SLC6 compatible: slc6_x86-64
    RHEL7 / CC7 compatible: slc7_x86-64
    RHEL8 / CC8 compatible: slc8_x86-64
+   RHEL9 / ALMA9 compatible: slc9_x86-64
    Ubuntu 20.04 compatible: ubuntu2004_x86-64
    Ubuntu 22.04 compatible: ubuntu2204_x86-64
    Fedora 33 compatible: fedora33_x86-64
@@ -354,7 +355,7 @@ def matchValidArch(architecture):
    Big Sur: osx_arm64
 """
 
-S3_SUPPORTED_ARCHS = "slc7_x86-64", "slc8_x86-64", "ubuntu2004_x86-64", "ubuntu2204_x86-64"
+S3_SUPPORTED_ARCHS = "slc7_x86-64", "slc8_x86-64", "ubuntu2004_x86-64", "ubuntu2204_x86-64", "slc9_x86-64"
 
 def finaliseArgs(args, parser):
 

diff --git a/alibuild_helpers/utilities.py b/alibuild_helpers/utilities.py
@@ -170,7 +170,7 @@ def doDetectArch(hasOsRelease, osReleaseLines, platformTuple, platformSystem, pl
     if version in debian_ubuntu:
       distribution = "ubuntu"
       version = debian_ubuntu[version]
-  elif distribution in ["redhat", "centos", "almalinux", "rockylinux"]:
+  elif distribution in ["redhat", "red hat enterprise linux", "centos", "almalinux", "rockylinux"]:
     distribution = "slc"
 
   processor = platformProcessor