-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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.
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
Add more license annotations #104527
Add more license annotations #104527
Conversation
This comment has been minimized.
This comment has been minimized.
ba28103
to
75d3ef4
Compare
This comment has been minimized.
This comment has been minimized.
☔ The latest upstream changes (presumably #107536) made this pull request unmergeable. Please resolve the merge conflicts. |
@rustbot author |
75d3ef4
to
d5a3a83
Compare
This helps downstream forks of the compiler like Ferrocene to have their own annotations for their own files, without having the upstream licensing be applied. For Ferrocene specifically we keep custom code in a top-level ferrocene/ directory, and we don't want the dep5 file to apply to it.
Some changes occurred in compiler/rustc_codegen_gcc cc @antoyo Some changes occurred in HTML/CSS/JS. cc @GuillaumeGomez, @Folyd, @jsha The Miri subtree was changed cc @rust-lang/miri Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
I reviewed this and was not clear about the policy/plan for the blocks surrounded by REUSE-IgnoreStart/REUSE-IgnoreEnd, so I asked @pietroalbini about it on Zulip over here. Executive Summary: The ignore directives are used to stop the REUSE tool from using the ignore-annotated copyright statements in question when building its resulting report. (as in, "it makes the tool ignore these blocks"). There are two scenarios where it is "okay" to ignore such statements:
I also asked Pietro whether our goal was to remove licenses entirely, or to replace licenses with spdx headers. Pietro said that they'd love in the long-term to have spdx headers in every file, but for the short term the focus is to minimal number of changes to get our repository into compliance (and I agree with that.) Overall, these spdx headers seem to require on the order of two lines of machine-parsed comments, so the aforementioned long-term plan seems reasonable to me |
@bors r+ rollup=never |
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FWIW these are copies of old rust source files, that had their license headers removed in rustc at some point but that change was never synced to Miri. So now this 'fork' has the SPDX header but the original file that still exists in rustc does not... it'd be more consistent to just remove the license header here without adding SPDX headers. But either way is fine for me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The rule of thumb I used is to keep the SPDX header for files that will end up outside of the monorepo, while removing it from files that will be kept only inside (i.e. rust-installer, which was straight up imported).
⌛ Testing commit 9c24608 with merge 7f10a4cc8073a74f83805676a7772cb25b1583e8... |
💔 Test failed - checks-actions |
@bors retry |
☀️ Test successful - checks-actions |
Finished benchmarking commit (6dfaa14): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. |
The job Click to see the possible cause of the failure (guessed by this bot)
|
Add more license annotations This PR updates the `.reuse/dep5` file to include more accurate licensing data for everything in the repository (*excluding* submodules and dependencies). Some decisions were made in this PR: * The standard copyright attribution for files maintained by us is "The Rust Project Developers (see https://thanks.rust-lang.org)", to avoid having to maintain an in-tree `AUTHORS` file. * For files that have specific licensing terms, we added the terms to the `.reuse/dep5` rather than adding SPDX comments in the files themselves. * REUSE picks up any comment/text line with `Copyright` on it, so I had to sprinkle around `REUSE-IgnoreStart` and `REUSE-IgnoreEnd` comments. The rendered `COPYRIGHT` file is available at https://gist.github.com/pietroalbini/efb81103f69596d39758114f3f6a8688. r? `@pnkfelix`
Add more license annotations This PR updates the `.reuse/dep5` file to include more accurate licensing data for everything in the repository (*excluding* submodules and dependencies). Some decisions were made in this PR: * The standard copyright attribution for files maintained by us is "The Rust Project Developers (see https://thanks.rust-lang.org)", to avoid having to maintain an in-tree `AUTHORS` file. * For files that have specific licensing terms, we added the terms to the `.reuse/dep5` rather than adding SPDX comments in the files themselves. * REUSE picks up any comment/text line with `Copyright` on it, so I had to sprinkle around `REUSE-IgnoreStart` and `REUSE-IgnoreEnd` comments. The rendered `COPYRIGHT` file is available at https://gist.github.com/pietroalbini/efb81103f69596d39758114f3f6a8688. r? `@pnkfelix`
This PR updates the
.reuse/dep5
file to include more accurate licensing data for everything in the repository (excluding submodules and dependencies). Some decisions were made in this PR:AUTHORS
file..reuse/dep5
rather than adding SPDX comments in the files themselves.Copyright
on it, so I had to sprinkle aroundREUSE-IgnoreStart
andREUSE-IgnoreEnd
comments.The rendered
COPYRIGHT
file is available at https://gist.github.com/pietroalbini/efb81103f69596d39758114f3f6a8688.r? @pnkfelix