qiurui
/
qtcoap
mirror of https://github.com/qt/qtcoap.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update licensing of files with infrastructure type 

A QUIP 18[1] update sets git files, REUSE.toml and licenseRule.json
as infrastructure type files. They are licensed with:
LicenseRef-Qt-Commercial OR BSD-3-Clause

[1]: https://contribute.qt-project.org/quips/18

Pick-to: 6.9 6.8
Change-Id: Ieb6657192f6ba3dcab0b04c5b1eb02e94b9bba73
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Lucie Gérard 2025-03-10 20:17:21 +01:00
parent 84f827608d
commit fa6fac26ec
2 changed files with 73 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
REUSE.toml
View File

@ -1,13 +1,13 @@
version = 1 version = 1
[[annotations]] [[annotations]]
path = [".tag", "**/.gitattributes", "**.gitignore"] path = ["**/.gitattributes", "**.gitignore", "**.gitreview"]
precedence = "closest" precedence = "closest"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "BSD-3-Clause" SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
[[annotations]] [[annotations]]
path = [".cmake.conf", "**.yaml", "**.yml", "**ci_config_linux.json"] path = [".tag", ".cmake.conf", "**.yaml", "**.yml", "**ci_config_linux.json"]
precedence = "closest" precedence = "closest"
comment = "build system" comment = "build system"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
@ -31,7 +31,7 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-on
path = ["**.toml", "licenseRule.json"] path = ["**.toml", "licenseRule.json"]
precedence = "override" precedence = "override"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
[[annotations]] [[annotations]]
path = ["**.pem"] path = ["**.pem"]

126
licenseRule.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"comment" : ["file_pattern_ending: strings matched against the end of a file name.", "comment": ["file_pattern_ending: strings matched against the end of a file name.",
"location keys: regular expression matched against the beginning of", "location keys: regular expression matched against the beginning of",
"the file path (relative to the git submodule root).", "the file path (relative to the git submodule root).",
"spdx: list of SPDX-License-Expression's allowed in the matching files.", "spdx: list of SPDX-License-Expression's allowed in the matching files.",
@ -9,88 +9,100 @@
"unless they are examples", "unless they are examples",
"Files with other endings can also be build system files" "Files with other endings can also be build system files"
], ],
"file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", "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", ".cmake.conf",".tag", "ci_config_linux.json",
".yaml", ".yml"], ".yaml", ".yml"],
"location" : { "location": {
"" : { "": {
"comment" : "Default", "comment": "Default",
"file type" : "build system", "file type": "build system",
"spdx" : ["BSD-3-Clause"] "spdx": ["BSD-3-Clause"]
}, },
"(.*)(examples/|snippets/)" : { "(.*)(examples/|snippets/)": {
"comment" : "Example takes precedent", "comment": "Example takes precedent",
"file type" : "examples and snippets", "file type": "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
} }
} }
}, },
{ {
"comments" : ["Files with the following endings are Tool licensed,", "comments": ["Files with the following endings are infrastructure licensed"],
"file_pattern_ending": [".gitattributes", ".gitignore", ".gitmodules", ".gitreview",
"_clang-format", "licenseRule.json", "REUSE.toml"],
"location":{
"": {
"comment": "Default",
"file type": "infrastructure",
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}
}
},
{
"comments": ["Files with the following endings are Tool licensed,",
"unless they are examples.", "unless they are examples.",
"Files with other endings can also be tool files."], "Files with other endings can also be tool files."],
"file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], "file_pattern_ending": [".sh", ".py", ".pl", ".bat", ".ps1"],
"location" :{ "location":{
"" : { "": {
"comment" : "Default", "comment": "Default",
"file type" : "tools and utils", "file type": "tools and utils",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
}, },
"(.*)(examples/|snippets/)" : { "(.*)(examples/|snippets/)": {
"comment" : "Example takes precedent", "comment": "Example takes precedent",
"file type" : "examples and snippets", "file type": "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
} }
} }
}, },
{ {
"comment" : "Files with the following endings are Documentation licensed.", "comment": "Files with the following endings are Documentation licensed.",
"file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json", "file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
"REUSE.toml", "licenseRule.json", "README.md", ".css"], "README.md", ".css"],
"location" :{ "location":{
"" : { "": {
"comment" : "", "comment": "",
"file type" : "documentation", "file type": "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
} }
} }
}, },
{ {
"comment" : ["All other files", "comment": ["All other files",
"The licensing is defined only by the file location in the Qt module repository.", "The licensing is defined only by the file location in the Qt module repository.",
"NO <file_pattern_ending> key for this case!", "NO <file_pattern_ending> key for this case!",
"This needs to be the last entry of the file."], "This needs to be the last entry of the file."],
"location" : { "location": {
"" : { "": {
"comment" : "Default", "comment": "Default",
"file type" : "module and plugin", "file type": "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
}, },
"dist/" : { "dist/": {
"comment" : "Default", "comment": "Default",
"file type" : "documentation", "file type": "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
}, },
"src/" : { "src/": {
"comment" : "Default", "comment": "Default",
"file type" : "module and plugin", "file type": "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
}, },
"tests/" : { "tests/": {
"comment" : "Default", "comment": "Default",
"file type" : "test", "file type": "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
}, },
"(.*)(examples/|snippets/)" : { "(.*)(examples/|snippets/)": {
"comment" : "Default", "comment": "Default",
"file type" : "examples and snippets", "file type": "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}, },
"tests/auto/qcoapclient/testdata/.*pem" : { "tests/auto/qcoapclient/testdata/.*pem": {
"comment" : "", "comment": "",
"file type" : "keys", "file type": "keys",
"spdx" : ["CC0-1.0"] "spdx": ["CC0-1.0"]
} }
} }
} }