summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2020-07-29 11:56:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-17 10:09:34 +0100
commit6a9fd9bd72103a6ea1b0fe819630e252e8350cf7 (patch)
tree33b5cdc9ba893189e038161a9f97994e0141595a /documentation
parent6dec8aab0e3b4d59d9f1b9c18c0e87d050274655 (diff)
downloadpoky-6a9fd9bd72103a6ea1b0fe819630e252e8350cf7.tar.gz
sphinx: toaster-manual: add figures
(From yocto-docs rev: 3b976f4b9a4fdcd8116b557a09fd18b69b684582) Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/toaster-manual/toaster-manual-intro.rst6
-rw-r--r--documentation/toaster-manual/toaster-manual-setup-and-use.rst28
2 files changed, 34 insertions, 0 deletions
diff --git a/documentation/toaster-manual/toaster-manual-intro.rst b/documentation/toaster-manual/toaster-manual-intro.rst
index bc4298dfce..c9d2617394 100644
--- a/documentation/toaster-manual/toaster-manual-intro.rst
+++ b/documentation/toaster-manual/toaster-manual-intro.rst
@@ -94,6 +94,12 @@ When Toaster is set up as a local instance, all the components reside on
94a single build host. Fundamentally, a local instance of Toaster is 94a single build host. Fundamentally, a local instance of Toaster is
95suited for a single user developing on a single build host. 95suited for a single user developing on a single build host.
96 96
97.. image:: figures/simple-configuration.png
98 :align: center
99
97Toaster as a hosted service is suited for multiple users developing 100Toaster as a hosted service is suited for multiple users developing
98across several build hosts. When Toaster is set up as a hosted service, 101across several build hosts. When Toaster is set up as a hosted service,
99its components can be spread across several machines: 102its components can be spread across several machines:
103
104.. image:: figures/hosted-service.png
105 :align: center
diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.rst b/documentation/toaster-manual/toaster-manual-setup-and-use.rst
index 360270afbf..1ff28395f3 100644
--- a/documentation/toaster-manual/toaster-manual-setup-and-use.rst
+++ b/documentation/toaster-manual/toaster-manual-setup-and-use.rst
@@ -439,6 +439,10 @@ When you create a project in Toaster, you will be asked to provide a
439name and to select a Yocto Project release. One of the release options 439name and to select a Yocto Project release. One of the release options
440you will find is called "Local Yocto Project". 440you will find is called "Local Yocto Project".
441 441
442.. image:: figures/new-project.png
443 :align: center
444 :scale: 75%
445
442When you select the "Local Yocto Project" release, Toaster will run your 446When you select the "Local Yocto Project" release, Toaster will run your
443builds using the local Yocto Project clone you have in your computer: 447builds using the local Yocto Project clone you have in your computer:
444the same clone you are using to run Toaster. Unless you manually update 448the same clone you are using to run Toaster. Unless you manually update
@@ -463,9 +467,17 @@ Yocto Project:
463 467
464- `meta-yocto-bsp <http://layers.openembedded.org/layerindex/branch/master/layer/meta-yocto-bsp/>`__ 468- `meta-yocto-bsp <http://layers.openembedded.org/layerindex/branch/master/layer/meta-yocto-bsp/>`__
465 469
470.. image:: figures/compatible-layers.png
471 :align: center
472 :scale: 75%
473
466If you want to build any other layers, you will need to manually import 474If you want to build any other layers, you will need to manually import
467them into your Toaster project, using the "Import layer" page. 475them into your Toaster project, using the "Import layer" page.
468 476
477.. image:: figures/import-layer.png
478 :align: center
479 :scale: 75%
480
469.. _toaster-web-interface-preferred-version: 481.. _toaster-web-interface-preferred-version:
470 482
471Building a Specific Recipe Given Multiple Versions 483Building a Specific Recipe Given Multiple Versions
@@ -477,6 +489,10 @@ versions of the ``bash`` recipe (i.e. 3.2.48 and 4.3.30-r0) and two
477versions of the ``which`` recipe (i.e. 2.21 and 2.18). The following 489versions of the ``which`` recipe (i.e. 2.21 and 2.18). The following
478figure shows this exact scenario: 490figure shows this exact scenario:
479 491
492.. image:: figures/bash-oecore.png
493 :align: center
494 :scale: 75%
495
480By default, the OpenEmbedded build system builds one of the two recipes. 496By default, the OpenEmbedded build system builds one of the two recipes.
481For the ``bash`` case, version 4.3.30-r0 is built by default. 497For the ``bash`` case, version 4.3.30-r0 is built by default.
482Unfortunately, Toaster as it exists, is not able to override the default 498Unfortunately, Toaster as it exists, is not able to override the default
@@ -487,11 +503,23 @@ variable. You can do so from Toaster, using the "Add variable" form,
487which is available in the "BitBake variables" page of the project 503which is available in the "BitBake variables" page of the project
488configuration section as shown in the following screen: 504configuration section as shown in the following screen:
489 505
506.. image:: figures/add-variable.png
507 :align: center
508 :scale: 75%
509
490To specify ``bash`` 3.2.48 as the version to build, enter 510To specify ``bash`` 3.2.48 as the version to build, enter
491"PREFERRED_VERSION_bash" in the "Variable" field, and "3.2.48" in the 511"PREFERRED_VERSION_bash" in the "Variable" field, and "3.2.48" in the
492"Value" field. Next, click the "Add variable" button: 512"Value" field. Next, click the "Add variable" button:
493 513
514.. image:: figures/set-variable.png
515 :align: center
516 :scale: 75%
517
494After clicking the "Add variable" button, the settings for 518After clicking the "Add variable" button, the settings for
495``PREFERRED_VERSION`` are added to the bottom of the BitBake variables 519``PREFERRED_VERSION`` are added to the bottom of the BitBake variables
496list. With these settings, the OpenEmbedded build system builds the 520list. With these settings, the OpenEmbedded build system builds the
497desired version of the recipe rather than the default version: 521desired version of the recipe rather than the default version:
522
523.. image:: figures/variable-added.png
524 :align: center
525 :scale: 75%