diff options
author | Antonin Godard <antonin.godard@bootlin.com> | 2025-03-27 15:22:13 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2025-05-19 08:32:49 -0700 |
commit | 1f2eca0a8e6fffd26f4b4a78736035385b014acc (patch) | |
tree | b2c43b2087fafb4c72b1b775cc778096d48335b1 | |
parent | 2a501e4f1b8120c73f581715430bae263d1c0b60 (diff) | |
download | poky-1f2eca0a8e6fffd26f4b4a78736035385b014acc.tar.gz |
dev-manual/sbom.rst: fix wrong build outputs
This document was written with SPDX 3.0 in mind (create-spdx-3.0 class)
on OE-Core's master, but Scarthgap only supports SPDX 2.2
(create-spdx-2.2).
The create-spdx-2.2 class only generate a tar.zst output, so remove the
other outputs listed here.
Also, ancillary outputs are not only deployed in tmp/deploy/spdx/MACHINE
but tmp/deploy/spdx in general.
(From yocto-docs rev: deedc7395f565e9820d914de9ffc3b14f8b143eb)
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | documentation/dev-manual/sbom.rst | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/documentation/dev-manual/sbom.rst b/documentation/dev-manual/sbom.rst index b72bad1554..7c4b5804fb 100644 --- a/documentation/dev-manual/sbom.rst +++ b/documentation/dev-manual/sbom.rst | |||
@@ -30,16 +30,9 @@ To make this happen, you must inherit the | |||
30 | 30 | ||
31 | INHERIT += "create-spdx" | 31 | INHERIT += "create-spdx" |
32 | 32 | ||
33 | Upon building an image, you will then get: | 33 | Upon building an image, you will then get the compressed archive |
34 | 34 | ``IMAGE-MACHINE.spdx.tar.zst`` contains the index and the files for the single | |
35 | - :term:`SPDX` output in JSON format as an ``IMAGE-MACHINE.spdx.json`` file in | 35 | recipes. |
36 | ``tmp/deploy/images/MACHINE/`` inside the :term:`Build Directory`. | ||
37 | |||
38 | - This toplevel file is accompanied by an ``IMAGE-MACHINE.spdx.index.json`` | ||
39 | containing an index of JSON :term:`SPDX` files for individual recipes. | ||
40 | |||
41 | - The compressed archive ``IMAGE-MACHINE.spdx.tar.zst`` contains the index | ||
42 | and the files for the single recipes. | ||
43 | 36 | ||
44 | The :ref:`ref-classes-create-spdx` class offers options to include | 37 | The :ref:`ref-classes-create-spdx` class offers options to include |
45 | more information in the output :term:`SPDX` data: | 38 | more information in the output :term:`SPDX` data: |
@@ -56,7 +49,7 @@ more information in the output :term:`SPDX` data: | |||
56 | 49 | ||
57 | Though the toplevel :term:`SPDX` output is available in | 50 | Though the toplevel :term:`SPDX` output is available in |
58 | ``tmp/deploy/images/MACHINE/`` inside the :term:`Build Directory`, ancillary | 51 | ``tmp/deploy/images/MACHINE/`` inside the :term:`Build Directory`, ancillary |
59 | generated files are available in ``tmp/deploy/spdx/MACHINE`` too, such as: | 52 | generated files are available in ``tmp/deploy/spdx`` too, such as: |
60 | 53 | ||
61 | - The individual :term:`SPDX` JSON files in the ``IMAGE-MACHINE.spdx.tar.zst`` | 54 | - The individual :term:`SPDX` JSON files in the ``IMAGE-MACHINE.spdx.tar.zst`` |
62 | archive. | 55 | archive. |