Let reuse look inside git submodules
#118445
Conversation
* Adding CC0-1.0 from https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt * Adding CC-BY-3.0 from https://creativecommons.org/licenses/by/3.0/legalcode.txt
Required because spdx-rs 0.5.3 added support for SPDX 2.3 documents and made these fields optional.
LLVM copyrights are now condensed to those reported in the .reuse/dep5 file.
A `reuse --include-submodules lint` now passes.
The LLVM project is a combination of some NCSA licensed files and some Apache-2.0 WITH LLVM-exception licensed files, so you should follow both licences when using the combined work. Also clarified where I got the copyright years and git hash from.
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-meta
|
rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead. cc @rust-lang/rust-analyzer |
| # any time LLVM is updated, please revisit this section. The copyrights are | ||
| # taken from the relevant LLVM sub-folders: llvm, lld, lldb, compiler-rt and libunwind. |
There was a problem hiding this comment.
It seems likely that we're going to not do this - especially without a clearer story on what "revisit" means.
Can we either remove this ask or try to make it more clear-cut to comply with it? Maybe we should be pushing LLVM upstream to improve metadata tracking of some kind?
There was a problem hiding this comment.
LLVM express their copyright through a combination of the CREDITS.txt file, and a collection of files called LICENSE.txt (example) dotted in various subfolders. There's no automated way to grok all that, so I had to do it manually.
The note were was as a reminder that, if someone bumps the LLVM subtree, they have to go and re-read the LICENSE.txt files and see if any of the copyrights have been updated or the LLVM license has changed. For example, as some point the NCSA license will be dropped and it will be Apache-with-exceptions only.
There was a problem hiding this comment.
I see. It seems likely that this will not happen on LLVM tree bumps (those are done far too often for someone to do this analysis). That's probably OK; it just means we'll want to eventually schedule some audit of this file (yearly or quaterly perhaps) that goes through and updates this sort of thing.
|
r=me with the names added in the rustdoc file case |
Mark-Simulacrum
added
S-waiting-on-author
See rust-lang#71237 for more details.
|
@bors r=Mark-Simulacrum |
|
@jonathanpallant: 🔑 Insufficient privileges: Not in reviewers |
|
@bors r=Mark-Simulacrum |
bors
added
S-waiting-on-bors
…odules, r=Mark-Simulacrum Let `reuse` look inside git submodules Changes `collect-license-metadata` and `generate-copyright` so they can now look at the git submodules. Unfortunately `reuse` chokes on the LLVM submodule - it finds the word "Copyright" or the unicode copyright symbol in all kinds of places, including UTF-8 test cases. The `reuse` tool expressly won't let you ignore folders, so we let it scan everything and then strip out the LLVM sub-folder in post. Instead, we add in a hand-curated list of copyright information gleaned by reading the LLVM codebase carefully, which is stored in `.reuse/dep5` in Debian format where `reuse` can find and use it. The `.reuse/dep5` continues to track copyright info for files in the tree that do not have SPDX metadata in them (i.e. all of them)
…mpiler-errors Rollup of 7 pull requests Successful merges: - rust-lang#118445 (Let `reuse` look inside git submodules) - rust-lang#118534 (codegen: panic when trying to compute size/align of extern type) - rust-lang#118756 (use bold magenta instead of bold white for highlighting) - rust-lang#118797 (End locals' live range before suspending coroutine) - rust-lang#118840 (remove some redundant clones) - rust-lang#118844 (Monomorphize args while building Instance body in StableMIR) - rust-lang#118848 (Add myself back to review rotation) r? `@ghost` `@rustbot` modify labels: rollup
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#118445 (Let `reuse` look inside git submodules) - rust-lang#118756 (use bold magenta instead of bold white for highlighting) - rust-lang#118797 (End locals' live range before suspending coroutine) - rust-lang#118840 (remove some redundant clones) - rust-lang#118844 (Monomorphize args while building Instance body in StableMIR) - rust-lang#118846 (Fix BinOp `ty()` assertion and `fn_sig()` for closures) - rust-lang#118848 (Add myself back to review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#118445 - ferrocene:jp-support-reuse-in-submodules, r=Mark-Simulacrum Let `reuse` look inside git submodules Changes `collect-license-metadata` and `generate-copyright` so they can now look at the git submodules. Unfortunately `reuse` chokes on the LLVM submodule - it finds the word "Copyright" or the unicode copyright symbol in all kinds of places, including UTF-8 test cases. The `reuse` tool expressly won't let you ignore folders, so we let it scan everything and then strip out the LLVM sub-folder in post. Instead, we add in a hand-curated list of copyright information gleaned by reading the LLVM codebase carefully, which is stored in `.reuse/dep5` in Debian format where `reuse` can find and use it. The `.reuse/dep5` continues to track copyright info for files in the tree that do not have SPDX metadata in them (i.e. all of them)
Changes
collect-license-metadataandgenerate-copyrightso they can now look at the git submodules.Unfortunately
reusechokes on the LLVM submodule - it finds the word "Copyright" or the unicode copyright symbol in all kinds of places, including UTF-8 test cases. Thereusetool expressly won't let you ignore folders, so we let it scan everything and then strip out the LLVM sub-folder in post. Instead, we add in a hand-curated list of copyright information gleaned by reading the LLVM codebase carefully, which is stored in.reuse/dep5in Debian format wherereusecan find and use it.The
.reuse/dep5continues to track copyright info for files in the tree that do not have SPDX metadata in them (i.e. all of them)