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

* ./bootstrap: 

- New: In coriolisEnv.py, support for Scientific Linux 6.
This commit is contained in:
Jean-Paul Chaput 2011-04-12 20:36:00 +00:00
parent 66d376fecc
commit 64c5e39423
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootstrap/coriolisEnv.py
View File

@ -32,6 +32,8 @@ def stripPath ( pathName ):
def guessOs (): def guessOs ():
osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*")
osSlsoc6x = re.compile (".*Linux.*el6.*")
osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*") osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*")
osSLSoC5x = re.compile (".*Linux.*(el5|2.6.23.13.*SoC).*") osSLSoC5x = re.compile (".*Linux.*(el5|2.6.23.13.*SoC).*")
osLinux_64 = re.compile (".*Linux.*x86_64.*") osLinux_64 = re.compile (".*Linux.*x86_64.*")
@ -44,7 +46,11 @@ def guessOs ():
lines = uname.stdout.readlines() lines = uname.stdout.readlines()
libDir="lib" libDir="lib"
if osSLSoC5x_64.match(lines[0]): if osSlsoc6x_64.match(lines[0]):
osType = "Linux.slsoc6x_64"
libSuffix = "64"
elif osSlsoc6x.match(lines[0]): osType = "Linux.slsoc6x"
elif osSLSoC5x_64.match(lines[0]):
osType = "Linux.SLSoC5x_64" osType = "Linux.SLSoC5x_64"
libDir = "lib64" libDir = "lib64"
elif osSLSoC5x.match(lines[0]): elif osSLSoC5x.match(lines[0]):
@ -156,7 +162,7 @@ fi
if options.python: if options.python:
pyVersion = sys.version_info pyVersion = sys.version_info
version = "%d.%d" % (pyVersion[0],pyVersion[1]) version = "%d.%d" % (pyVersion[0],pyVersion[1])
if osType[:8] == "Linux.SL": if osType.startswith("Linux.SL") or osType.startswith("Linux.sl"):
sitePackagesDir = "%s/python%s/site-packages" % (absLibDir,version) sitePackagesDir = "%s/python%s/site-packages" % (absLibDir,version)
else: else:
sitePackagesDir = "%s/python%s/dist-packages" % (absLibDir,version) sitePackagesDir = "%s/python%s/dist-packages" % (absLibDir,version)