diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-05-01 11:20:36 +0200 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-05-01 11:20:36 +0200 |
| commit | f9dd82539d67c0a72dc104bbeec0da2297842e92 (patch) | |
| tree | 61c813be080cbbb86fa3c10498669673a852bbf3 | |
| parent | 9f3633f07fde46de647d2e77ae1b01ccb5d7e299 (diff) | |
| download | at-f9dd82539d67c0a72dc104bbeec0da2297842e92.tar.gz | |
Update to work after flexlm.linaro.org move
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | bero_tools.sh | 1 | ||||
| -rw-r--r-- | install.sh | 4 | ||||
| -rw-r--r-- | tools.sh | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/bero_tools.sh b/bero_tools.sh index 13f17a9..440e5f4 100644 --- a/bero_tools.sh +++ b/bero_tools.sh @@ -1,6 +1,7 @@ # Set this to your env export ENV_MODEL_PATH=/home/bero/Aarch64/RTSM_AEMv8_VE export REMOTEUSER=bernhardrosenkranzer +export FLEXLM_USER=bernhard.rosenkranzer echo "Model at $ENV_MODEL_PATH" export SCRIPT_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) @@ -7,7 +7,9 @@ else sudo apt-get install python fi -sudo bash -c "echo \"127.0.0.1 flexlm.linaro.org\" >> /etc/hosts" +# Older versions added a flexlm.linaro.org 127.0.0.1 hack in /etc/hosts +# Let's get rid of that... +sudo sed -i '/flexlm.linaro.org/d' /etc/hosts sudo update @@ -1,6 +1,7 @@ [ -z "$ENV_MODEL_PATH" ] && echo "Need to set ENV_MODEL_PATH to the model's path, exiting" && return 1; -[ -z "$REMOTEUSER" ] && REMOTEUSER=$USER +[ -z "$REMOTEUSER" ] && REMOTEUSER="$USER" +[ -z "$FLEXLM_USER" ] && FLEXLM_USER="$REMOTEUSER" [ ! -f "$ENV_MODEL_PATH/models/Linux64_GCC-4.1/RTSM_VE_AEMv8A.so" ] && echo "Can't find RTSM_VE_AEMv8A.so at \$ENV_MODEL_PATH/models/Linux64_GCC-4.1/ You set ENV_MODEL_PATH to $ENV_MODEL_PATH @@ -104,7 +105,7 @@ function run() { export MODEL_PATH=$ENV_MODEL_PATH export PATH=$PATH:$MODEL_PATH/bin/ - export ARMLMD_LICENSE_FILE="8224@flexlm.linaro.org" + export ARMLMD_LICENSE_FILE="8224@localhost" local grepssh=$(ps aux | grep "[s]sh -L 8224") echo $grepssh @@ -112,8 +113,8 @@ function run() { if [ -z "$grepssh" ]; then ssh -L 8224:localhost:8224 \ -L 18224:localhost:18224 \ - -N portfwd@23.21.178.170 & - sleep 2 + -N $FLEXLM_USER@flexlm.linaro.org & + sleep 5 fi if [ ! -e boot/linux-system.axf ]; then echo "run untarboot or updateboot" |