| Message ID | 20250327-sdpx-relocate-variables-v1-1-cd8227bde515@bootlin.com |
|---|---|
| State | Accepted, archived |
| Commit | 8ce06538c9cde0f09909a5a2e61ec10b0d35df49 |
| Headers | show |
| Series | classes/spdx-*.bbclass: move spdx2 specific variables out of spdx-common class | expand |
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index de62379c50..7e8f8b9ff5 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass @@ -15,6 +15,8 @@ SPDX_SUPPLIER[doc] = "The SPDX PackageSupplier field for SPDX packages created f is the contact information for the person or organization who is doing the \ build." +SPDX_ARCHIVE_SOURCES ??= "0" +SPDX_ARCHIVE_PACKAGED ??= "0" def get_namespace(d, name): import uuid diff --git a/meta/classes/spdx-common.bbclass b/meta/classes/spdx-common.bbclass index 81ad4d3b7a..36feb56807 100644 --- a/meta/classes/spdx-common.bbclass +++ b/meta/classes/spdx-common.bbclass @@ -26,8 +26,6 @@ SPDX_TOOL_VERSION ??= "1.0" SPDXRUNTIMEDEPLOY = "${SPDXDIR}/runtime-deploy" SPDX_INCLUDE_SOURCES ??= "0" -SPDX_ARCHIVE_SOURCES ??= "0" -SPDX_ARCHIVE_PACKAGED ??= "0" SPDX_UUID_NAMESPACE ??= "sbom.openembedded.org" SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdocs"
Setting SPDX_ARCHIVE_SOURCES and SPDX_ARCHIVE_PACKAGED makes no difference when using the spdx-3.0 class. Move these two in the spdx-2.0 class since they are only used there. Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> --- Note: if these are planned to be used in the future for spdx3, please let me know - I'm trying to clear things out in the documentation. --- meta/classes/create-spdx-2.2.bbclass | 2 ++ meta/classes/spdx-common.bbclass | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) --- base-commit: 1db86a3381c94951de44bb2b6ec840fd99a7d4be change-id: 20250327-sdpx-relocate-variables-f7aa9b7f2810 Best regards,