From b42043a40def6f487a603f5b10bdbfcec325c9c8 Mon Sep 17 00:00:00 2001 From: Barthelemy Date: Wed, 18 Oct 2023 14:03:56 +0200 Subject: [PATCH 1/4] Add support for rhel9 --- alibuild_helpers/args.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/alibuild_helpers/args.py b/alibuild_helpers/args.py index 6c7b5221..a706dd15 100644 --- a/alibuild_helpers/args.py +++ b/alibuild_helpers/args.py @@ -331,7 +331,7 @@ def optionOrder(x): args = finaliseArgs(parser.parse_args(), parser) return (args, parser) -VALID_ARCHS_RE = "^slc[5-9]_(x86-64|ppc64|aarch64)$|^(ubuntu|ubt|osx|fedora)[0-9]*_(x86-64|arm64)$" +VALID_ARCHS_RE = "^slc[5-9]_(x86-64|ppc64|aarch64)$|^(rhel|ubuntu|ubt|osx|fedora)[0-9]*_(x86-64|arm64)$" def matchValidArch(architecture): return bool(re.match(VALID_ARCHS_RE, architecture)) @@ -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 compatible: rhel9_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", "rhel9_x86-64" def finaliseArgs(args, parser): From 107fdeaf43d60086bbc803ada5ad17dcb9b9b037 Mon Sep 17 00:00:00 2001 From: Barthelemy Date: Wed, 18 Oct 2023 14:39:37 +0200 Subject: [PATCH 2/4] switch to slc9 --- alibuild_helpers/args.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alibuild_helpers/args.py b/alibuild_helpers/args.py index a706dd15..0250e8b0 100644 --- a/alibuild_helpers/args.py +++ b/alibuild_helpers/args.py @@ -341,7 +341,7 @@ def matchValidArch(architecture): RHEL6 / SLC6 compatible: slc6_x86-64 RHEL7 / CC7 compatible: slc7_x86-64 RHEL8 / CC8 compatible: slc8_x86-64 - RHEL9 compatible: rhel9_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 @@ -355,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", "rhel9_x86-64" +S3_SUPPORTED_ARCHS = "slc7_x86-64", "slc8_x86-64", "ubuntu2004_x86-64", "ubuntu2204_x86-64", "slc9_x86-64" def finaliseArgs(args, parser): From 4ccd30cc044030b89196d27e3b118f38f301cdac Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Wed, 18 Oct 2023 13:03:02 +0000 Subject: [PATCH 3/4] Remove unused "rhel" arch prefix --- alibuild_helpers/args.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alibuild_helpers/args.py b/alibuild_helpers/args.py index 0250e8b0..5f3702c0 100644 --- a/alibuild_helpers/args.py +++ b/alibuild_helpers/args.py @@ -331,7 +331,7 @@ def optionOrder(x): args = finaliseArgs(parser.parse_args(), parser) return (args, parser) -VALID_ARCHS_RE = "^slc[5-9]_(x86-64|ppc64|aarch64)$|^(rhel|ubuntu|ubt|osx|fedora)[0-9]*_(x86-64|arm64)$" +VALID_ARCHS_RE = "^slc[5-9]_(x86-64|ppc64|aarch64)$|^(ubuntu|ubt|osx|fedora)[0-9]*_(x86-64|arm64)$" def matchValidArch(architecture): return bool(re.match(VALID_ARCHS_RE, architecture)) From bc06a6b91ad7b2529115eff9be49ed15644dfffd Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Wed, 18 Oct 2023 15:14:01 +0200 Subject: [PATCH 4/4] Detect slc9 arch on RHEL9 correctly --- alibuild_helpers/utilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alibuild_helpers/utilities.py b/alibuild_helpers/utilities.py index 33dfacad..cd694dfa 100644 --- 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