Merge branch 'RHEL8PlusSupport-master-20220610' into 'master'

RHEL 8+ Support, master branch (2022.06.10)

See merge request !961

Build/AtlasCMake/modules/AtlasInternals.cmake

@@ -182,7 +182,8 @@ function( atlas_os_id os isValid )
       elseif( ( _linuxId MATCHES "CentOS" ) OR
               ( _linuxId MATCHES "centos" ) )
          set( _linuxShort "centos" )
-      elseif( _linuxId MATCHES "RedHat" )
+      elseif( ( _linuxId MATCHES "RedHat" ) OR
+              ( _linuxId MATCHES "rhel" ) )
          set( _linuxShort "rhel" )
       elseif( _linuxId MATCHES "Debian" )
          set( _linuxShort "debian" )

Build/AtlasLCG/LCGConfig.cmake

@@ -135,7 +135,8 @@ function( lcg_os_id os isValid )
       elseif( ( _lcgLinuxId MATCHES "CentOS" ) OR
               ( _lcgLinuxId MATCHES "centos" ) )
          set( _linuxShort "centos" )
-      elseif( _lcgLinuxId MATCHES "RedHat" )
+      elseif( ( _lcgLinuxId MATCHES "RedHat" ) OR
+              ( _lcgLinuxId MATCHES "rhel" ) )
          set( _linuxShort "rhel" )
       elseif( _lcgLinuxId MATCHES "Debian" )
          set( _linuxShort "debian" )