| Message ID | 20260302-release-notes-6-0-v1-5-9662dee58591@bootlin.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | Update the documentation for 6.0 (Wrynose) | expand |
Hi Antonin, On 3/2/26 10:37 AM, Antonin Godard via lists.yoctoproject.org wrote: > Document the SPDX_CONCLUDED_LICENSE variable, added by commit > bb21c6a429a2 ("spdx30_tasks: Add concluded license support with > SPDX_CONCLUDED_LICENSE") in OE-Core. > > Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> > --- > documentation/ref-manual/variables.rst | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst > index 579faf7be..f8056b03d 100644 > --- a/documentation/ref-manual/variables.rst > +++ b/documentation/ref-manual/variables.rst > @@ -9194,6 +9194,22 @@ system and gives an overview of their function and contents. > (+ 0.07\% with the tested image), compared to just enabling > :term:`SPDX_INCLUDE_SOURCES`. > > + :term:`SPDX_CONCLUDED_LICENSE` > + The :term:`SPDX_CONCLUDED_LICENSE` variable allows overriding the > + ``hasConcludedLicense`` object to individual SBOM packages. This can be > + used when the license of a package was determined to be different than the > + original license string value, after analysis. > + > + This variable can be set in two ways: > + > + - For the entire recipe:: > + > + SPDX_CONCLUDED_LICENSE = "MIT & Apache-2.0" > + > + - For an individual package produced by the recipe: > + Inconsistent with the first item in the list, this should be ::. Cheers, Quentin
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 579faf7be..f8056b03d 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst @@ -9194,6 +9194,22 @@ system and gives an overview of their function and contents. (+ 0.07\% with the tested image), compared to just enabling :term:`SPDX_INCLUDE_SOURCES`. + :term:`SPDX_CONCLUDED_LICENSE` + The :term:`SPDX_CONCLUDED_LICENSE` variable allows overriding the + ``hasConcludedLicense`` object to individual SBOM packages. This can be + used when the license of a package was determined to be different than the + original license string value, after analysis. + + This variable can be set in two ways: + + - For the entire recipe:: + + SPDX_CONCLUDED_LICENSE = "MIT & Apache-2.0" + + - For an individual package produced by the recipe: + + SPDX_CONCLUDED_LICENSE:${PN} = "MIT & Apache-2.0" + :term:`SPDX_CUSTOM_ANNOTATION_VARS` This option allows to associate `SPDX annotations <https://spdx.github.io/spdx-spec/v2.3/annotations/>`__ to a recipe,
Document the SPDX_CONCLUDED_LICENSE variable, added by commit bb21c6a429a2 ("spdx30_tasks: Add concluded license support with SPDX_CONCLUDED_LICENSE") in OE-Core. Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> --- documentation/ref-manual/variables.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)