Skip to content

Commit

Permalink
Mark MIT-Khronos-old license as custom one, to ensure SBOM validation
Browse files Browse the repository at this point in the history
spdx_tools doesn't recognize the MIT-Khronos-old license id, even
though it's listed at at https://spdx.org/licenses/

That's because the tools are using the database at

https://github.com/nexB/license-expression/blob/c20b3f605daefc7cd9e4dc7b34e95280f206def3/src/license_expression/data/scancode-licensedb-index.json

which doesn't list that license id. The database just hasn't been
updated to the latest sdpx license version.

Until that happens, prepend LicenseRef- to the license id and license
file name to make the SBOM validation pass.

Amends fc91074

Pick-to: 6.7 6.8
Task-number: QTBUG-126403
Change-Id: Ida3929007447277c3a164276cebda54ed3305f63
Reviewed-by: Kai Köhne <[email protected]>
  • Loading branch information
alcroito committed Jul 15, 2024
1 parent 17c1133 commit 4bede00
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/3rdparty/SPIRV-Cross/qt_attribution.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Homepage": "https://github.com/KhronosGroup/SPIRV-Cross",
"Version": "2d990d355a296ae1e368585810f884ebadcc4773",
"License": "Apache License 2.0 and MIT Khronos - old variant",
"LicenseId": "Apache-2.0 AND MIT-Khronos-old",
"LicenseId": "Apache-2.0 AND LicenseRef-MIT-Khronos-old",
"CopyrightFile": "COPYRIGHT.txt"
}
]
2 changes: 1 addition & 1 deletion src/3rdparty/glslang/qt_attribution.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Homepage": "https://github.com/KhronosGroup/glslang",
"Version": "14.2.0",
"License": "BSD 3-Clause \"New\" or \"Revised\" License, and MIT Khronos - old variant, and Apache License 2.0, and GNU General Public License v3.0 or later with Bison exception 2.2, and AML glslang variant License",
"LicenseId": "BSD-3-Clause AND MIT-Khronos-old AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND AML-glslang",
"LicenseId": "BSD-3-Clause AND LicenseRef-MIT-Khronos-old AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND AML-glslang",
"LicenseFile": "LICENSE.txt",
"CopyrightFile": "COPYRIGHT.txt"
}
Expand Down

0 comments on commit 4bede00

Please sign in to comment.