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

Bug corrections.

This commit is contained in:
The Coriolis Project 2011-02-09 16:40:49 +00:00
parent e1751177e0
commit 8e0bd6d4b9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bootstrap/coriolis2.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
scriptPath="${BASH_SOURCE[0]}"; scriptPath="$0"
if [ -h "${scriptPath}" ] then if [ -h "${scriptPath}" ]; then
while [ -h "${scriptPath}" ]; do scriptPath=`readlink "${scriptPath}"`; done while [ -h "${scriptPath}" ]; do scriptPath=`readlink "${scriptPath}"`; done
fi fi
@ -12,6 +12,7 @@
popd > /dev/null popd > /dev/null
coriolisEnvPy="${sysconfDir}/coriolisEnv.py" coriolisEnvPy="${sysconfDir}/coriolisEnv.py"
echo $coriolisEnvPy
if [ -e ${coriolisEnvPy} ]; then if [ -e ${coriolisEnvPy} ]; then
eval "`${coriolisEnvPy} --v2 --release --shared --python`" eval "`${coriolisEnvPy} --v2 --release --shared --python`"

9
bootstrap/coriolisEnv.py
View File

@ -131,19 +131,20 @@ fi
elif coriolisVersion == 2: elif coriolisVersion == 2:
buildDir = buildType + "." + linkType
scriptDir = os.path.dirname ( os.path.abspath(__file__) ) scriptDir = os.path.dirname ( os.path.abspath(__file__) )
print "echo %s;" % scriptDir
if scriptDir == "/etc/coriolis2": if scriptDir == "/etc/coriolis2":
coriolisTop = "/usr" coriolisTop = "/usr"
sysconfDir = scriptDir sysconfDir = scriptDir
shellMessage = "Using system-wide Coriolis 2 (/usr)" shellMessage = "Using system-wide Coriolis 2 (/usr)"
elif scriptDir == "/asim/coriolis2": elif scriptDir == "/asim/coriolis2/etc/coriolis2":
coriolisTop = scriptDir coriolisTop = "/asim/coriolis2"
sysconfDir = scriptDir + "/etc/coriolis2" sysconfDir = scriptDir
shellMessage = "Using SoC network-wide Coriolis 2 (/asim/coriolis2)" shellMessage = "Using SoC network-wide Coriolis 2 (/asim/coriolis2)"
else: else:
if not rootDir: if not rootDir:
rootDir = os.getenv("HOME") + "/coriolis-2.x" rootDir = os.getenv("HOME") + "/coriolis-2.x"
buildDir = buildType + "." + linkType
coriolisTop = "%s/%s/%s/install" % ( rootDir, osType, buildDir ) coriolisTop = "%s/%s/%s/install" % ( rootDir, osType, buildDir )
sysconfDir = coriolisTop + "/etc/coriolis2" sysconfDir = coriolisTop + "/etc/coriolis2"
shellMessage = "Using user-selected Coriolis 2 (%s)" % rootDir shellMessage = "Using user-selected Coriolis 2 (%s)" % rootDir