Skip to content
Snippets Groups Projects
PL1
Commit 21ef2f4d authored by Maxime Francois Perrotin's avatar Maxime Francois Perrotin
Browse files

Merge branch 'feature_bullseye' into 'feature_buster'

Feature bullseye

See merge request !96
parents 73ebbc86 d00ebf7e
Branches
No related tags found
5 merge requests!166Add script to force answer "yes" to apt-update,!154Don't use apt-get, use apt,!147Update Ubuntu dependencies,!101Feature samv71 runtime,!96Feature bullseye
Pipeline #582748 passed
kazoo @ e123fc06
Subproject commit c70d3acb427b94d1fd9f4daeac643a640ce911d6
Subproject commit e123fc06dac785d56cc8229dbe1f652cc7a5f2ec
......@@ -77,22 +77,24 @@ work/skeletons_built: InterfaceView.aadl DataView.aadl
touch \$@
work/glue_release: InterfaceView.aadl DeploymentView.aadl DataView.aadl
sed -i 's/CoverageEnabled => true/CoverageEnabled => false/g' DeploymentView.aadl || :
\$(KAZOO) -p --glue --gw -o work
touch \$@
work/glue_debug: InterfaceView.aadl DeploymentView.aadl DataView.aadl
sed -i 's/CoverageEnabled => true/CoverageEnabled => false/g' DeploymentView.aadl || :
\$(KAZOO) --debug -p --glue --gw -o work
touch \$@
work/glue_coverage: InterfaceView.aadl Default_Deployment.aadl DataView.aadl
rsync --checksum DV_Coverage.aadl DeploymentView.aadl
work/glue_coverage: InterfaceView.aadl DeploymentView.aadl DataView.aadl
sed -i 's/CoverageEnabled => false/CoverageEnabled => true/g' DeploymentView.aadl || :
\$(KAZOO) --debug -p --glue --gw -o work
touch \$@
InterfaceView.aadl: interfaceview.xml
\$(SPACECREATOR) --aadlconverter -o \$^ -t \$(shell taste-config --prefix)/share/xml2aadl/interfaceview.tmplt -x \$@
%: %.dv.xml
%: %.dv.xml Default_Deployment.aadl
# Build using deployment view \$^
@# We must update the .aadl only if the dv.xml file has changed (more recent timestamp)
if [ \$< -nt \$@.aadl ]; then \
......@@ -106,7 +108,6 @@ interfaceview: Default_Deployment.aadl
Default_Deployment.aadl: interfaceview.xml
# Create/update a default deployment view for Linux target, if none other is provided
\$(SPACECREATOR) --aadlconverter -o \$^ -t \$(shell taste-config --prefix)/share/xml2dv/interfaceview.tmplt -x \$@ || exit 1
\$(SPACECREATOR) --aadlconverter -o \$^ -t \$(shell taste-config --prefix)/share/iv2dv-coverage/interfaceview.tmplt -x DV_Coverage.aadl || exit 1
rsync --checksum \$@ DeploymentView.aadl
DeploymentView.aadl: Default_Deployment.aadl
......
......@@ -189,10 +189,12 @@ public
{% for partition in node.partitions %}
{% for function in partition.functions %}
IV_{{ function.name }} : system Interfaceview::IV::{{ function.name }}::{{ function.name }}.others { -- XXX complete path?
Taste::FunctionName => "{{ function }}";
Taste::FunctionName => "{{ function.name }}";
};
{% endfor %}
{{ partition.name }} : process deploymentview::DV::{{ node.nodeLabel }}::{{ partition.name }}.others; {# XXX Missing Port_Number, but what is that? #}
{{ partition.name }} : process deploymentview::DV::{{ node.nodeLabel }}::{{ partition.name }}.others { {# XXX Missing Port_Number, but what is that? #}
TASTE_DV_Properties::CoverageEnabled => false;
};
{% endfor %}
{% for attr in node.attributes %}
{% if attr.name == "type" %}
......
orchestrator @ 32c921e6
Subproject commit 5999c0227dbf06e0f86adc6898435be5d4064fcb
Subproject commit 32c921e6eb96a8002631db7d199a443cdc016c6a
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment