From 2318ac5b616d9c321f59f7bdd562b38148718301 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Fri, 18 Mar 2011 13:41:02 +0000 Subject: [PATCH] Added support for Scientific Linux 6. --- bootstrap/buildCoriolis.py | 8 +++++++- bootstrap/coriolisEnv.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py index 3046b4c1..bb01677d 100755 --- a/bootstrap/buildCoriolis.py +++ b/bootstrap/buildCoriolis.py @@ -128,6 +128,8 @@ class ProjectBuilder: def _guessOs ( self ): self._libSuffix = None + self._osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*") + self._osSlsoc6x = re.compile (".*Linux.*el6.*") self._osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*") self._osSLSoC5x = re.compile (".*Linux.*(el5|2.6.23.13.*SoC).*") self._osLinux_64 = re.compile (".*Linux.*x86_64.*") @@ -137,7 +139,11 @@ class ProjectBuilder: uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) lines = uname.stdout.readlines() - if self._osSLSoC5x_64.match(lines[0]): + if self._osSlsoc6x_64.match(lines[0]): + self._osType = "Linux.slsoc6x_64" + self._libSuffix = "64" + elif self._osSlsoc6x .match(lines[0]): self._osType = "Linux.slsoc6x" + elif self._osSLSoC5x_64.match(lines[0]): self._osType = "Linux.SLSoC5x_64" self._libSuffix = "64" elif self._osSLSoC5x .match(lines[0]): self._osType = "Linux.SLSoC5x" diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py index 28684060..9288cf3f 100755 --- a/bootstrap/coriolisEnv.py +++ b/bootstrap/coriolisEnv.py @@ -156,7 +156,7 @@ fi if options.python: pyVersion = sys.version_info version = "%d.%d" % (pyVersion[0],pyVersion[1]) - if osType[8] == "Linux.SL": + if osType[:8] == "Linux.SL": sitePackagesDir = "%s/python%s/site-packages" % (absLibDir,version) else: sitePackagesDir = "%s/python%s/dist-packages" % (absLibDir,version)