Merge branch 'master' of https://gitrepos.estec.esa.int/taste/taste-setup

install/40_ocarina.sh

@@ -5,6 +5,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Setup the tools in ~/.local/bin
 cd "$DIR/../ocarina" || exit 1
 
+# Install Maxime's customized version of available deployment targets
+cat ../misc/supported-platforms/ocarina_components.aadl  | \
+    sed "s,/home/taste/tool-inst,$(taste-config --prefix)," > \
+    ${PREFIX}/share/ocarina/AADLv2/ocarina_components.aadl
+
 # Skip Ocarina building if tree is clean and version is identical
 HEAD="$(git log --oneline | head -1 | cut -d' ' -f1)"
 VERSION_INSTALLED="$(ocarina -v 2>&1 | grep ^Oca | awk '{print $NF}' | sed 's,),,;s,r,,')"
@@ -25,11 +30,6 @@ make distclean # ignore any errors here
 make || exit 1
 make install
 
-# Install Maxime's customized version of available deployment targets
-cat ../misc/supported-platforms/ocarina_components.aadl  | \
-    sed "s,/home/taste/tool-inst,$(taste-config --prefix)," > \
-    ${PREFIX}/share/ocarina/AADLv2/ocarina_components.aadl
-
 # Add Ocarina to PATH
 PATH_CMD='export PATH=$PATH:'"${PREFIX}/bin"
 UpdatePATH

misc/supported-platforms/ocarina_components.aadl

@@ -2250,7 +2250,7 @@ properties
    Scheduler_Quantum => 0 Ms;
    Preemptive_Scheduler => true;
    Deployment::Execution_Platform => LEON_RTEMS_POSIX;
-   EnvVars => "RTEMS_MAKEFILE_PATH_LEON=/opt/rtems-4.12-2017.07.17/sparc-rtems4.12/gr712rc:CFLAGS=-DCONFIGURE_SMP_APPLICATION -DCONFIGURE_MAXIMUM_PROCESSORS=4 ";
+   EnvVars => "RTEMS_MAKEFILE_PATH_LEON=/opt/rtems-4.12-2017.07.17/sparc-rtems4.12/gr712rc:CFLAGS=-DCONFIGURE_SMP_APPLICATION -DCONFIGURE_MAXIMUM_PROCESSORS=2 ";
 end gr712.rtems412_posix;
 
 processor implementation gr740.rtems412_posix