spdx: migrate from SPDX 2.2 to SPDX 3.0 - #208
Draft
SandeepR-NI wants to merge 2 commits into
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Reverts the two NI-added commits that pinned SPDX generation to version 2.2,
restoring the upstream default of SPDX 3.0.
Background
Upstream OE-Core switched the default SPDX version to 3.0 (commit beef4c1).
NI temporarily pinned back to 2.2 (commit ad7d668) because NI Central
components expected the legacy
spdx.tar.zstartifact only produced by SPDX 2.2.The 2.2 class was also restored (commit b924800) after upstream removed it.
Changes
Commit 1 — Reapply "Remove SPDX 2.2 support" (reverts b924800)
meta/classes/create-spdx-2.2.bbclassmeta/lib/oe/sbom.py(SPDX 2.2 helpers)meta/lib/oe/spdx.py(SPDX 2.2 data model)meta/lib/oeqa/selftest/cases/spdx.pyCommit 2 — Reapply "Switch default spdx version to 3.0" (reverts ad7d668)
meta/classes/create-spdx.bbclass:inherit create-spdx-2.2→inherit create-spdx-3.0Verification
Tested locally with
bitbake base-files:do_create_spdxanddo_create_package_spdxtasks succeed.spdx.jsonfiles produced underdeploy/spdx/3.0.1/"specVersion": "3.0.1".spdx.tar.zstproduced by the new buildDependencies
NI Central consumers of
spdx.tar.zst(rtos_cross_toolchain.mak,generate_cdx_sboms.mak) must be updated to consume.spdx.jsonbeforethis is merged to production.