diff --git a/bootstrap/allianceInstaller.sh b/bootstrap/allianceInstaller.sh index 71f02906..5aa12daa 100755 --- a/bootstrap/allianceInstaller.sh +++ b/bootstrap/allianceInstaller.sh @@ -1,7 +1,7 @@ #!/bin/bash srcDir=${HOME}/coriolis-2.x/src/alliance/alliance/src - commonRoot=${HOME}/coriolis-2.x/Linux.el7_64/Release.Shared + commonRoot=${HOME}/coriolis-2.x/Linux.el9/Release.Shared buildDir=${commonRoot}/build installDir=${commonRoot}/install diff --git a/bootstrap/builder/Configuration.py b/bootstrap/builder/Configuration.py index 98565f28..41ff45f5 100644 --- a/bootstrap/builder/Configuration.py +++ b/bootstrap/builder/Configuration.py @@ -122,6 +122,7 @@ class Configuration ( object ): def _guessOs ( self ): self._libSuffix = None + self._osEL9 = re.compile (".*Linux.*(el9|al9).*x86_64.*") self._osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*") self._osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*") self._osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*") @@ -145,7 +146,10 @@ class Configuration ( object ): uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) lines = uname.stdout.readlines() osLine = lines[0].decode( 'ascii' ) - if self._osSlsoc7x_64.match(osLine): + if self._osEL9.match(osLine): + self._osType = "Linux.el9" + self._libSuffix = "64" + elif self._osSlsoc7x_64.match(osLine): self._osType = "Linux.el7_64" self._libSuffix = "64" elif self._osSlsoc6x_64.match(osLine): diff --git a/bootstrap/ccb.py b/bootstrap/ccb.py index ebd80d53..96bfd663 100755 --- a/bootstrap/ccb.py +++ b/bootstrap/ccb.py @@ -62,6 +62,7 @@ def checkCMake (): def guessOs (): libDir = 'lib' + osEL9 = re.compile (".*Linux.*(el9|al9).*x86_64.*") osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*") osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*") osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*") @@ -85,7 +86,10 @@ def guessOs (): uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) lines = uname.stdout.readlines() line = lines[0].decode( 'ascii' ) - if osSlsoc7x_64.match(line): + if osEL9.match(line): + osType = "Linux.el9" + libDir = "lib64" + elif osSlsoc7x_64.match(line): osType = "Linux.el7_64" libDir = "lib64" elif osSlsoc6x_64.match(line): diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py index ab86d3ea..42cf735c 100755 --- a/bootstrap/coriolisEnv.py +++ b/bootstrap/coriolisEnv.py @@ -38,6 +38,7 @@ def scrubPath ( pathName ): def guessOs (): useDevtoolset = False + osEL9 = re.compile (".*Linux.*el9.*x86_64.*") osSlsoc7x_64 = re.compile (".*Linux.*el7.*x86_64.*") osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*") osSlsoc6x = re.compile (".*Linux.*(el|slsoc)6.*") @@ -65,6 +66,7 @@ def guessOs (): line = lines[0].decode( 'ascii' ) if osSlsoc7x_64.match(line): osType = "Linux.el7_64" + elif osEL9.match(line): osType = "Linux.el9" elif osSlsoc6x_64.match(line): osType = "Linux.slsoc6x_64" useDevtoolset = True diff --git a/bootstrap/socInstaller.py b/bootstrap/socInstaller.py index 74c3030f..190cb0e1 100755 --- a/bootstrap/socInstaller.py +++ b/bootstrap/socInstaller.py @@ -432,8 +432,12 @@ class Configuration ( object ): raise ErrorMessage( 1, [ 'Cannot find , should be here:' , ' "{}"'.format(self.ccbBin) ] ) - otherArgs = [] + otherArgs = [ '--qt5' ] if self.debugArg: otherArgs.append( self.debugArg ) + if target == 'EL9': + otherArgs.append( '--project=support' ) + commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs , fdLog=self.fds['coriolis'] ) ) + #commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 1, otherArgs+['--doc'], fdLog=self.fds['coriolis'] ) ) if target == 'SL7_64': otherArgs.append( '--project=support' ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs , fdLog=self.fds['coriolis'] ) ) @@ -444,7 +448,6 @@ class Configuration ( object ): commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 6, otherArgs , fdLog=self.fds['coriolis'] ) ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 1, otherArgs+['--doc'], fdLog=self.fds['coriolis'] ) ) elif target == 'Ubuntu18' or target == 'Debian9' or target == 'Debian10': - if target == 'Ubuntu18': otherArgs.append( '--qt5' ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) ) if self.doBenchs: commands.append( BenchsCommand( self.benchsDir, fdLog=self.fds['benchs'] ) )