riscv
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for RHEL9.

This commit is contained in:
Jean-Paul Chaput 2021-12-31 16:35:38 +01:00
parent 5f8a0a944c
commit 084eee3b39
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/allianceInstaller.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
srcDir=${HOME}/coriolis-2.x/src/alliance/alliance/src 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 buildDir=${commonRoot}/build
installDir=${commonRoot}/install installDir=${commonRoot}/install

6
bootstrap/builder/Configuration.py
View File

@ -122,6 +122,7 @@ class Configuration ( object ):
def _guessOs ( self ): def _guessOs ( self ):
self._libSuffix = None self._libSuffix = None
self._osEL9 = re.compile (".*Linux.*(el9|al9).*x86_64.*")
self._osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*") self._osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*")
self._osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*") self._osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*")
self._osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*") self._osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*")
@ -145,7 +146,10 @@ class Configuration ( object ):
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines() lines = uname.stdout.readlines()
osLine = lines[0].decode( 'ascii' ) 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._osType = "Linux.el7_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osSlsoc6x_64.match(osLine): elif self._osSlsoc6x_64.match(osLine):

6
bootstrap/ccb.py
View File

@ -62,6 +62,7 @@ def checkCMake ():
def guessOs (): def guessOs ():
libDir = 'lib' libDir = 'lib'
osEL9 = re.compile (".*Linux.*(el9|al9).*x86_64.*")
osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*") osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*")
osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*") osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*")
osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*") osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*")
@ -85,7 +86,10 @@ def guessOs ():
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines() lines = uname.stdout.readlines()
line = lines[0].decode( 'ascii' ) 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" osType = "Linux.el7_64"
libDir = "lib64" libDir = "lib64"
elif osSlsoc6x_64.match(line): elif osSlsoc6x_64.match(line):

2
bootstrap/coriolisEnv.py
View File

@ -38,6 +38,7 @@ def scrubPath ( pathName ):
def guessOs (): def guessOs ():
useDevtoolset = False useDevtoolset = False
osEL9 = re.compile (".*Linux.*el9.*x86_64.*")
osSlsoc7x_64 = re.compile (".*Linux.*el7.*x86_64.*") osSlsoc7x_64 = re.compile (".*Linux.*el7.*x86_64.*")
osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*") osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*")
osSlsoc6x = re.compile (".*Linux.*(el|slsoc)6.*") osSlsoc6x = re.compile (".*Linux.*(el|slsoc)6.*")
@ -65,6 +66,7 @@ def guessOs ():
line = lines[0].decode( 'ascii' ) line = lines[0].decode( 'ascii' )
if osSlsoc7x_64.match(line): osType = "Linux.el7_64" if osSlsoc7x_64.match(line): osType = "Linux.el7_64"
elif osEL9.match(line): osType = "Linux.el9"
elif osSlsoc6x_64.match(line): elif osSlsoc6x_64.match(line):
osType = "Linux.slsoc6x_64" osType = "Linux.slsoc6x_64"
useDevtoolset = True useDevtoolset = True

7
bootstrap/socInstaller.py
View File

@ -432,8 +432,12 @@ class Configuration ( object ):
raise ErrorMessage( 1, [ 'Cannot find <ccb.py>, should be here:' raise ErrorMessage( 1, [ 'Cannot find <ccb.py>, should be here:'
, ' "{}"'.format(self.ccbBin) , ' "{}"'.format(self.ccbBin)
] ) ] )
otherArgs = [] otherArgs = [ '--qt5' ]
if self.debugArg: otherArgs.append( self.debugArg ) 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': if target == 'SL7_64':
otherArgs.append( '--project=support' ) otherArgs.append( '--project=support' )
commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs , fdLog=self.fds['coriolis'] ) ) 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, 6, otherArgs , fdLog=self.fds['coriolis'] ) )
commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 1, otherArgs+['--doc'], 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': 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'] ) ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) )
if self.doBenchs: if self.doBenchs:
commands.append( BenchsCommand( self.benchsDir, fdLog=self.fds['benchs'] ) ) commands.append( BenchsCommand( self.benchsDir, fdLog=self.fds['benchs'] ) )