Make module ready for source SBOM checking

This includes:
- turning VERIFY_SOURCE_SBOM ON
- adding rules to the licenseRule.json files
- correcting the licensing given via REUSE.toml files

A lot of files are skipped during the license test,
but all are present in the source SBOM.
This is why corrections are needed before turning the
source SBOM check on.

Task-number: QTBUG-131434
Pick-to: 6.9 6.8
Change-Id: I7880a9c8fbda06422a09cf70ac9ffbed750cd781
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Lucie Gérard 2025-01-21 15:58:33 +01:00
parent 37962dfa4a
commit 7fc95e8788
3 changed files with 22 additions and 6 deletions

View File

@ -14,8 +14,8 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only"
[[annotations]]
path = ["**.pro", "**.pri", "**.qrc", ".cmake.conf", "**.yaml", "**.json",
"**BLACKLIST", "qt_cmdline.cmake"]
path = ["**.pro", "**.pri", "**.qrc", ".cmake.conf", "**.yaml",
"**BLACKLIST", "qt_cmdline.cmake", "**ci_config_linux.json"]
precedence = "closest"
comment = "build system"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
@ -28,14 +28,14 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "BSD-3-Clause"
[[annotations]]
path = ["**/doc/images/**", "examples/**"]
path = ["examples/**"]
comment = "this must be after the build system table because example and snippets take precedence over build system"
precedence = "closest"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
[[annotations]]
path = ["**/README*", "**.qdocconf", "**.qdocinc",
path = ["**/doc/images/**", "**/README*", "**.qdocconf", "**.qdocinc",
"src/charts/doc/style/offline.css", "**.metainfo"]
comment = "documentation"
precedence = "closest"

View File

@ -6,6 +6,9 @@ accept_configuration:
instructions:
Build:
- type: EnvironmentVariable
variableName: VERIFY_SOURCE_SBOM
variableValue: "ON"
- !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test:

View File

@ -10,7 +10,9 @@
"Files with other endings can also be build system files"
],
"file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
"configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"],
"configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in",
".cmake.conf", ".gitattributes", ".gitignore", ".tag", "ci_config_linux.json",
".yaml", ".qrc", "BLACKLIST"],
"location" : {
"" : {
"comment" : "Default",
@ -44,7 +46,8 @@
},
{
"comment" : "Files with the following endings are Documentation licensed.",
"file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"],
"file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
"REUSE.toml", "licenseRule.json", ".css", ".metainfo"],
"location" :{
"" : {
"comment" : "",
@ -64,6 +67,11 @@
"file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
},
"dist/" : {
"comment" : "Default",
"file type" : "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
},
"src/" : {
"comment" : "Default",
"file type" : "module and plugin",
@ -83,6 +91,11 @@
"comment" : "Default",
"file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
},
"(examples|.*).*doc/images/" : {
"comment" : "Default",
"file type" : "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
}
}
}