Index: foundation/relicensing/index.html
===================================================================
--- foundation/relicensing/index.html
+++ foundation/relicensing/index.html
@@ -25,7 +25,7 @@
Beyond that, these topics have also been discussed by, and include contributions from, over a dozen lawyers and key LLVM contributors, and have been discussed informally with hundreds of people in the LLVM Developer Meeting BoFs. The effort has been overseen by Heather Meeker, who is the LLVM Foundation’s legal counsel. If you have questions or concerns about the content of this document, please email the llvm-dev mailing list or the LLVM Foundation Board depending on the sensitivity of your email.
-Status and Documents
+Status and Documents
At this point, we have achieved community consensus on:
@@ -37,28 +37,66 @@
The license text itself. This is the expected LICENSE.TXT file.
The revised LLVM developer policy patch.
+
-That said, we still need to:
+
+We also have worked with our legal counsel to build several more boring pieces:
-- Finalize the new top-of-file copyright header block.
+
- A new top-of-file header block that is minimal and includes the relevant and important information about the new license.
+
- A corporate agreement to relicense that is available for companies to sign and has begun to be distributed to some of the known and/or large contributors.
+
+
+
+
+That said, we still need to:
-
Finalize the process and forms used for corporations and individuals to relicense past contributions under the new license structure. We currently believe that the corporate relicensing form will be a paper form, and that the individual contributor agreement will be a click-through web form.
+
+- Finalize the process and forms used for individuals to relicense past contributions under the new license structure. We believe that the individual contributor agreement will be a click-through web form.
- Decide a date upon which all new contributions will be under both the new and old license agreements.
- Decide upon and enact a process for getting 100% of existing code relicensed under the new agreement (using the aforementioned forms) or rewrite/remove the code.
- Drop the old license when the entire codebase is covered under the new license.
-Next Steps and Schedule Estimate
+
+
+
+The new file header will be:
+
+//===-- file/name - File description ----------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+
+
+
+Some notable aspects of the new header:
+
+
+- There is no explicit copyright notice -- these had little value and tended to not be maintained.
+- It is designed to be as compact and minimalist as possible while having the critical information: that it is part of LLVM, what license it is under, where to find that license, and the machine-scrapable SPDX markup to help people doing license audits.
+
+
+
+Corporate Relicensing Agreement
+
+
+Corporations may sign an agreement to relicense their contributions to LLVM under the new license with Docusign. This is our preferred mechanism for collecting signatures. However, if your company requires it, you can print out this PDF of the agreement, sign it, scan it, and send the signed version as a PDF attachment to the LLVM Foundation Board. Further, if your company has a specific concern or issue with the agreement, please reach out to the the board and we'll try to help.
+
+
+Next Steps and Schedule Estimate
Our goal is to openly and transparently communicate our process, including the expected next steps and a timeframe that can be used for planning. That said, we are dealing with a lot of unknowns, so while we believe the following schedule is achievable, this is not a guarantee:
-- ~May 2018: We aim to have the corporate agreement (to relicense prior contributions) approved by the LLVM Foundation board and LLVM legal counsel, and will post it on this web page. At this point, we will ask corporate contributors (e.g. through email to llvm-dev) to bring it to their company legal team. We aim to get sign-off from as many companies as possible starting at this point.
-- ~June 2018: We aim to have the individual license agreement approved, and have the web interface for it implemented prior to the LLVM 7.0 release. We will add details about that to this web page, release notes, and will solicit individual contributors to relicense their prior contributions (e.g. on llvm-dev).
+- ~October 2018: We aim to have the individual license agreement approved, and have it posted prior to the US developer's meeting. We will add details about that to this web page, release notes, and will solicit individual contributors to relicense their prior contributions (e.g. on llvm-dev).
- ~January 2019: Coincident with the final release branch date for LLVM 8.0, we will install the new developer policy. To ensure that all contributors have agreed to the terms of the new developer policy, we will recind commit access from all contributors who are not covered by a corporate or individual agreement at that point. We will develop a policy for affected contributors to regain commit access.