diff options
| author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2020-07-29 11:56:18 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-17 10:09:34 +0100 |
| commit | 6a9fd9bd72103a6ea1b0fe819630e252e8350cf7 (patch) | |
| tree | 33b5cdc9ba893189e038161a9f97994e0141595a | |
| parent | 6dec8aab0e3b4d59d9f1b9c18c0e87d050274655 (diff) | |
| download | poky-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>
| -rw-r--r-- | documentation/toaster-manual/toaster-manual-intro.rst | 6 | ||||
| -rw-r--r-- | documentation/toaster-manual/toaster-manual-setup-and-use.rst | 28 |
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 | |||
| 94 | a single build host. Fundamentally, a local instance of Toaster is | 94 | a single build host. Fundamentally, a local instance of Toaster is |
| 95 | suited for a single user developing on a single build host. | 95 | suited for a single user developing on a single build host. |
| 96 | 96 | ||
| 97 | .. image:: figures/simple-configuration.png | ||
| 98 | :align: center | ||
| 99 | |||
| 97 | Toaster as a hosted service is suited for multiple users developing | 100 | Toaster as a hosted service is suited for multiple users developing |
| 98 | across several build hosts. When Toaster is set up as a hosted service, | 101 | across several build hosts. When Toaster is set up as a hosted service, |
| 99 | its components can be spread across several machines: | 102 | its 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 | |||
| 439 | name and to select a Yocto Project release. One of the release options | 439 | name and to select a Yocto Project release. One of the release options |
| 440 | you will find is called "Local Yocto Project". | 440 | you will find is called "Local Yocto Project". |
| 441 | 441 | ||
| 442 | .. image:: figures/new-project.png | ||
| 443 | :align: center | ||
| 444 | :scale: 75% | ||
| 445 | |||
| 442 | When you select the "Local Yocto Project" release, Toaster will run your | 446 | When you select the "Local Yocto Project" release, Toaster will run your |
| 443 | builds using the local Yocto Project clone you have in your computer: | 447 | builds using the local Yocto Project clone you have in your computer: |
| 444 | the same clone you are using to run Toaster. Unless you manually update | 448 | the 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 | |||
| 466 | If you want to build any other layers, you will need to manually import | 474 | If you want to build any other layers, you will need to manually import |
| 467 | them into your Toaster project, using the "Import layer" page. | 475 | them 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 | ||
| 471 | Building a Specific Recipe Given Multiple Versions | 483 | Building 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 | |||
| 477 | versions of the ``which`` recipe (i.e. 2.21 and 2.18). The following | 489 | versions of the ``which`` recipe (i.e. 2.21 and 2.18). The following |
| 478 | figure shows this exact scenario: | 490 | figure shows this exact scenario: |
| 479 | 491 | ||
| 492 | .. image:: figures/bash-oecore.png | ||
| 493 | :align: center | ||
| 494 | :scale: 75% | ||
| 495 | |||
| 480 | By default, the OpenEmbedded build system builds one of the two recipes. | 496 | By default, the OpenEmbedded build system builds one of the two recipes. |
| 481 | For the ``bash`` case, version 4.3.30-r0 is built by default. | 497 | For the ``bash`` case, version 4.3.30-r0 is built by default. |
| 482 | Unfortunately, Toaster as it exists, is not able to override the default | 498 | Unfortunately, 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, | |||
| 487 | which is available in the "BitBake variables" page of the project | 503 | which is available in the "BitBake variables" page of the project |
| 488 | configuration section as shown in the following screen: | 504 | configuration section as shown in the following screen: |
| 489 | 505 | ||
| 506 | .. image:: figures/add-variable.png | ||
| 507 | :align: center | ||
| 508 | :scale: 75% | ||
| 509 | |||
| 490 | To specify ``bash`` 3.2.48 as the version to build, enter | 510 | To 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 | |||
| 494 | After clicking the "Add variable" button, the settings for | 518 | After 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 |
| 496 | list. With these settings, the OpenEmbedded build system builds the | 520 | list. With these settings, the OpenEmbedded build system builds the |
| 497 | desired version of the recipe rather than the default version: | 521 | desired version of the recipe rather than the default version: |
| 522 | |||
| 523 | .. image:: figures/variable-added.png | ||
| 524 | :align: center | ||
| 525 | :scale: 75% | ||
