Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add some categorizations for GCC exception 3.1 #163

Merged
merged 3 commits into from
Dec 28, 2023
Merged

Add some categorizations for GCC exception 3.1 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4f1553
chore(scancode-licenses): Sort (license,exception)-categorizations
fviernau Dec 28, 2023
168ee90
feat(scancode-licenses): Add some categorizations for GCC-exception-3.1
fviernau Dec 28, 2023
1a4afae
chore: Re-generate license classifications
fviernau Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions license-classifications.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,11 @@ categorizations:
- "copyleft-limited"
- "include-in-notice-file"
- "include-source-code-offer-in-notice-file"
- id: "GPL-3.0-only WITH GCC-exception-3.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just FYI, I was thinking (with @willebra and others) about actually allowing to classify exceptions on their own. There's nothing built into ORT that currently prohibits that. And it would have the advantage that you don't need to classify e.g. GCC-exception-3.1 with every license it can be combined with, but only GCC-exception-3.1 on its own. Then, taking into account ORT's exception mapping, you'd know the applicable licenses, and could handle the combination of licenses with exception only in rules, but not yet in the classification.

categories:
- "copyleft"
- "include-in-notice-file"
- "include-source-code-offer-in-notice-file"
- id: "GPL-3.0-or-later"
categories:
- "copyleft"
Expand All @@ -1092,6 +1097,11 @@ categorizations:
- "copyleft-limited"
- "include-in-notice-file"
- "include-source-code-offer-in-notice-file"
- id: "GPL-3.0-or-later WITH GCC-exception-3.1"
categories:
- "copyleft"
- "include-in-notice-file"
- "include-source-code-offer-in-notice-file"
- id: "Giftware"
categories:
- "permissive"
Expand Down
6 changes: 4 additions & 2 deletions tools/curations/buildSrc/src/main/kotlin/ScanCodeLicenseDbClassifications.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,11 @@ private val LICENSE_EXCEPTION_CATEGORIZATIONS = listOf(
"Apache-2.0 WITH Swift-exception" to CATEGORY_PERMISSIVE,
"GPL-2.0-only WITH Classpath-exception-2.0" to CATEGORY_COPYLEFT_LIMITED,
"GPL-2.0-or-later WITH Classpath-exception-2.0" to CATEGORY_COPYLEFT_LIMITED,
"GPL-3.0-only WITH Classpath-exception-2.0" to CATEGORY_COPYLEFT_LIMITED,
"GPL-3.0-only WITH Autoconf-exception-3.0" to CATEGORY_COPYLEFT,
"GPL-3.0-or-later WITH Classpath-exception-2.0" to CATEGORY_COPYLEFT_LIMITED
"GPL-3.0-only WITH Classpath-exception-2.0" to CATEGORY_COPYLEFT_LIMITED,
"GPL-3.0-only WITH GCC-exception-3.1" to CATEGORY_COPYLEFT,
"GPL-3.0-or-later WITH Classpath-exception-2.0" to CATEGORY_COPYLEFT_LIMITED,
"GPL-3.0-or-later WITH GCC-exception-3.1" to CATEGORY_COPYLEFT,
).map { (license, category) ->
LicenseCategorization(
id = SpdxSingleLicenseExpression.parse(license),
Expand Down
Loading