From 45d870f1420c045ad9117233b2ce5f99ec8440d0 Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Tue, 23 May 2023 09:16:48 +0000 Subject: [PATCH 1/2] doc: Add kas-container documentation for Corstone-1000 FVP As there is a difference in usage between `kas` and `kas-container` when building images for the Corstone-1000 FVP, add `kas-container` command lines to the FVP user guide This is a minor change to align langdale-dev with main Signed-off-by: Adam Johnston --- documentation/user_manual/corstone1000fvp.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/documentation/user_manual/corstone1000fvp.rst b/documentation/user_manual/corstone1000fvp.rst index 8d3d73e..30d1d72 100644 --- a/documentation/user_manual/corstone1000fvp.rst +++ b/documentation/user_manual/corstone1000fvp.rst @@ -35,6 +35,13 @@ To build a Corstone-1000 FVP image: kas build --update meta-cassini-config/kas/cassini.yml:meta-cassini-config/kas/corstone1000-fvp.yml +Or if using kas-container: + + .. code-block:: console + + kas-container --runtime-args "-e FVP_CORSTONE1000_EULA_ACCEPT=True" build \ + meta-cassini-config/kas/cassini.yml:meta-cassini-config/kas/corstone1000-fvp.yml + *** Run *** @@ -51,6 +58,14 @@ To start the FVP and get the console: kas shell -c="../layers/meta-arm/scripts/runfvp --verbose --console" \ meta-cassini-config/kas/cassini.yml:meta-cassini-config/kas/corstone1000-fvp.yml +Or if using kas-container: + + .. code-block:: console + + kas-container --runtime-args "-e FVP_CORSTONE1000_EULA_ACCEPT=True" \ + shell -c="/work/layers/meta-arm/scripts/runfvp --verbose --console" \ + meta-cassini-config/kas/cassini.yml:meta-cassini-config/kas/corstone1000-fvp.yml + .. _reproduce_run-time_integration_tests: ********** -- GitLab From cc8428beaf888f974ceaac8659651b1aba4ded2d Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Tue, 23 May 2023 09:23:23 +0000 Subject: [PATCH 2/2] doc: Correct usage of `kas shell` in documentation The correct syntax for `kas shell` is `kas shell [-c COMMAND]` or `kas shell [--command COMMAND]` rather than `kas shell [-c=COMMAND]` Anything else may work with a given kas version (by design or by accident) but is not documented behavior Signed-off-by: Adam Johnston --- documentation/user_manual/corstone1000fvp.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/user_manual/corstone1000fvp.rst b/documentation/user_manual/corstone1000fvp.rst index 30d1d72..8d9265d 100644 --- a/documentation/user_manual/corstone1000fvp.rst +++ b/documentation/user_manual/corstone1000fvp.rst @@ -55,7 +55,7 @@ To start the FVP and get the console: .. code-block:: console - kas shell -c="../layers/meta-arm/scripts/runfvp --verbose --console" \ + kas shell -c "../layers/meta-arm/scripts/runfvp --verbose --console" \ meta-cassini-config/kas/cassini.yml:meta-cassini-config/kas/corstone1000-fvp.yml Or if using kas-container: @@ -63,7 +63,7 @@ Or if using kas-container: .. code-block:: console kas-container --runtime-args "-e FVP_CORSTONE1000_EULA_ACCEPT=True" \ - shell -c="/work/layers/meta-arm/scripts/runfvp --verbose --console" \ + shell -c "/work/layers/meta-arm/scripts/runfvp --verbose --console" \ meta-cassini-config/kas/cassini.yml:meta-cassini-config/kas/corstone1000-fvp.yml .. _reproduce_run-time_integration_tests: -- GitLab