Commit f00bec7e authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Merge branch 'bug.9.1' of https://gitrepos.estec.esa.int/taste/taste-setup into bug.9.1

parents 4dab3046 63252dba
Subproject commit 6665e0632db0a1b11c2942bd8ae293a00d9bc126 Subproject commit 85b513a73f8dcf71e39667a7b1a69c811313cc2f
...@@ -48,7 +48,7 @@ fi ...@@ -48,7 +48,7 @@ fi
# Make sure the RTEMS_MAKEFILE_PATH_LEON is set # Make sure the RTEMS_MAKEFILE_PATH_LEON is set
grep RTEMS_MAKEFILE_PATH_LEON $HOME/.bashrc.taste >/dev/null || { grep RTEMS_MAKEFILE_PATH_LEON $HOME/.bashrc.taste >/dev/null || {
read UNUSED FINAL_RTEMS_FOLDER <<< $(cat "$INSTALLED_RTEMS_INFO") read UNUSED FINAL_RTEMS_FOLDER <<< $(cat "$INSTALLED_RTEMS_INFO")
LEON2_FOLDER="$(find $FINAL_RTEMS_FOLDER -type d -name leon2)" LEON3_FOLDER="$(find $FINAL_RTEMS_FOLDER -type d -name leon3)"
echo Adding RTEMS_MAKEFILE_PATH_LEON env var to settings. echo Adding RTEMS_MAKEFILE_PATH_LEON env var to settings.
echo "export RTEMS_MAKEFILE_PATH_LEON=\"$LEON2_FOLDER\"" >> $HOME/.bashrc.taste echo "export RTEMS_MAKEFILE_PATH_LEON=\"$LEON3_FOLDER\"" >> $HOME/.bashrc.taste
} }
Subproject commit 43b15716589bd06b05993f2a9443ce787736bf9a Subproject commit d48e25e1ec8f77fdcc4de4e0aead8a143ce17743
Subproject commit 013fa32df2f4762e67c5b8f9fbf1a5fa77945989 Subproject commit 3cd130e334d7fa837e5367d6725251f2359c9df2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment