Hi Leif, Thanks for the reviews. Responses below.
Mike > -----Original Message----- > From: Leif Lindholm [mailto:leif.lindh...@linaro.org] > Sent: Tuesday, March 26, 2019 11:09 AM > To: Kinney, Michael D <michael.d.kin...@intel.com> > Cc: edk2-devel@lists.01.org > Subject: Re: [edk2] [PATCH V2] Change EDK II to > BSD+Patent License > > Hi Mike, > > First of all - now the March table tag was made (and I'm > back from > holiday), I had planned to do the move of BeagleBoardPkg > and > Omap35xxPkg to edk2-platforms. > > Would you prefer me to put that on hold, or should we > drop those > changes from this set and worry about those if/when we > get around to > relicensing edk2-platforms too? I do not have a strong opinion on when those packages move to edk2-platforms. I am holding off on other package moves I am involved in until after the license change. > > For the changes to ArmPkg, ArmPlatformPkg, EmbeddedPkg(, > BeagleBoardPkg, Omap35xxPkg): > Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org> > Thank you! > For the changes to edk2: > License.txt - could the commit message describe where > the new text is > from (as an implicit way of explaining why the > layout/bulleting has changed in the portion > that is > otherwise content-wise identical)? I do not follow what you want updated here. Which commit and what would you like the message changed to? > - (I'm sorry, I should just keep quiet, > but...) > The copyright lines at the top of the > Licence.txt file > have been bugging me since day 1. Can we > drop them? > Clearly none of these organisations hold > copyright over > either the old or the new license. > The copyrights at the top of that file were inherited from the packages when License.txt used to be in each package. If you think it is appropriate to remove them I am happy to do that as part of this series. Does the same comment apply to License.txt in OvmfPkg? > I'll just add that my wording for the Signed-off-by was > just a > meant as a starting point and I'd be happy to see it > improved. Please let me know if you have any suggestions here. > > But from my end, all edk2: patches other than > "edk2: Change License.txt from 2-Clause BSD to > BSD+Patent": > Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org> > > / > Leif > > On Sat, Mar 23, 2019 at 02:25:15AM +0000, Kinney, > Michael D wrote: > > Hello, > > > > New in V2 > > ========= > > * Remove Cc lines from commit messages > > * Remove branch reference from commit messages > > * Change license in 2 files missed in OvmfPkg > > * Update OvmfPkg/License.txt to BSD+Patent as the > default license > > * Move the portions of Contributions.txt in the root > of edk2 to > > Readme.md in the root of edk2 that describe how to > contribute > > along with the commit message format. > > * Add to Readme.md in the root of edk2 that Signed- > off-by means that > > the contributor certifies compliance to the > Developer's Certificate > > of Origin 1.1. https://developercertificate.org > > ========= > > > > BZ: > https://bugzilla.tianocore.org/show_bug.cgi?id=1373 > > > > This change is based on the following emails: > > https://lists.01.org/pipermail/edk2-devel/2019- > February/036260.html > > https://lists.01.org/pipermail/edk2-devel/2018- > October/030385.html > > > > RFCs with detailed process for the license change: > > V3: https://lists.01.org/pipermail/edk2-devel/2019- > March/038116.html > > V2: https://lists.01.org/pipermail/edk2-devel/2019- > March/037669.html > > V1: https://lists.01.org/pipermail/edk2-devel/2019- > March/037500.html > > > > I have posted the patch series for review on the > following branch using > > edk2-stable201903 as the base for the patch series. > > > > > https://github.com/mdkinney/edk2/tree/Bug_1373_BsdPatent > License_V2 > > > > The commits in patch series can be viewed here: > > > > > https://github.com/mdkinney/edk2/commits/Bug_1373_BsdPat > entLicense_V2 > > > > The patch series has one patch per package along with > a few patches > > to update the license information in the root of the > edk2 repository > > as described in the RFC V3. > > > > Due to the size of the patch series, I prefer to not > send the > > patch emails. Instead, please perform code reviews > using content > > from the branch. > > > > All EDK II package maintainers and package reviewers > should provide > > review feedback for their packages. The critical part > of the review > > is: > > 1) Any changes that cause build breaks or logic > changes. These code > > changes are intended to only modify license > contents in comment > > blocks. > > 2) Any file that has been changed to BSD+Patent, but > should remain > > with the current license. > > 3) Any file that that has not changed to BSD+Patent, > but should be > > changed to BSD+Patent. > > > > Feedback and Reviewed-by emails should identify the > patch the feedback > > applies using the patch summary listed below. The > goal is to complete > > all reviews to support the commit of these patches on > April 9, 2019. > > > > 2a7d2c56bc edk2: Remove Contributions.txt and update > Readme.md > > f9d59ccdc5 OvmfPkg: Change License.txt from 2-Clause > BSD to BSD+Patent > > ce3fbf929e StdLibPrivateInternalFiles: Replace BSD > License with BSD+Patent License > > aa8a3692c7 StdLib: Replace BSD License with BSD+Patent > License > > 2dfbe1e1ee AppPkg: Replace BSD License with BSD+Patent > License > > b2161f6dd8 Vlv2TbltDevicePkg: Replace BSD License with > BSD+Patent License > > 3688c33755 Vlv2DeviceRefCodePkg: Replace BSD License > with BSD+Patent License > > 8170308c98 UefiCpuPkg: Replace BSD License with > BSD+Patent License > > 4b68832cdc StandaloneMmPkg: Replace BSD License with > BSD+Patent License > > 327dc18122 SourceLevelDebugPkg: Replace BSD License > with BSD+Patent License > > 6c4c506a5e SignedCapsulePkg: Replace BSD License with > BSD+Patent License > > 2fdd514aff ShellPkg: Replace BSD License with > BSD+Patent License > > c667724cb9 ShellBinPkg: Replace BSD License with > BSD+Patent License > > 76f9e555b8 SecurityPkg: Replace BSD License with > BSD+Patent License > > 89a588c1be QuarkSocPkg: Replace BSD License with > BSD+Patent License > > 454f280e0c QuarkPlatformPkg: Replace BSD License with > BSD+Patent License > > 935319af35 PcAtChipsetPkg: Replace BSD License with > BSD+Patent License > > e39d07266d OvmfPkg: Replace BSD License with > BSD+Patent License > > 24d6ba8a25 OptionRomPkg: Replace BSD License with > BSD+Patent License > > 5c4a074eed Omap35xxPkg: Replace BSD License with > BSD+Patent License > > dde19815b3 Nt32Pkg: Replace BSD License with > BSD+Patent License > > acf2e84beb NetworkPkg: Replace BSD License with > BSD+Patent License > > 3e404f30b6 MdePkg: Replace BSD License with BSD+Patent > License > > 6e01bf6764 MdeModulePkg: Replace BSD License with > BSD+Patent License > > 36322b1b8c IntelSiliconPkg: Replace BSD License with > BSD+Patent License > > f5f9fa8b95 IntelFspWrapperPkg: Replace BSD License > with BSD+Patent License > > 39725dc5e3 IntelFspPkg: Replace BSD License with > BSD+Patent License > > ba8a9e3e1d IntelFsp2WrapperPkg: Replace BSD License > with BSD+Patent License > > a61295eeda IntelFsp2Pkg: Replace BSD License with > BSD+Patent License > > cd7bd24c6d IntelFrameworkPkg: Replace BSD License with > BSD+Patent License > > e9f7710bb6 IntelFrameworkModulePkg: Replace BSD > License with BSD+Patent License > > 487e96a6b4 FmpDevicePkg: Replace BSD License with > BSD+Patent License > > 3cfd1b98e4 FatPkg: Replace BSD License with BSD+Patent > License > > f9fc278ea1 EmulatorPkg: Replace BSD License with > BSD+Patent License > > 1a26764621 EmbeddedPkg: Replace BSD License with > BSD+Patent License > > aa402ac906 EdkCompatibilityPkg: Replace BSD License > with BSD+Patent License > > 3c6df91d7c DynamicTablesPkg: Replace BSD License with > BSD+Patent License > > 6389a5b4d5 CryptoPkg: Replace BSD License with > BSD+Patent License > > 0065fa2d9f CorebootPayloadPkg: Replace BSD License > with BSD+Patent License > > 26d7dbf868 CorebootModulePkg: Replace BSD License with > BSD+Patent License > > b1ebd76234 BeagleBoardPkg: Replace BSD License with > BSD+Patent License > > f23540ea65 ArmVirtPkg: Replace BSD License with > BSD+Patent License > > 054b667071 ArmPlatformPkg: Replace BSD License with > BSD+Patent License > > 5128ec1897 ArmPkg: Replace BSD License with BSD+Patent > License > > 3b7fd23df9 BaseTools: Replace BSD License with > BSD+Patent License > > aa5e7ad3ef edk2: Replace BSD License with BSD+Patent > License > > fdcf6f00c7 edk2: Change License.txt from 2-Clause BSD > to BSD+Patent > > 831e2096e8 edk2: Add License-History.txt > > > > Best regards, > > > > Mike > > > > > -----Original Message----- > > > From: Kinney, Michael D > > > Sent: Friday, March 22, 2019 6:49 PM > > > To: edk2-devel@lists.01.org; Kinney, Michael D > > > <michael.d.kin...@intel.com> > > > Subject: [RFC v3] Change EDK II to BSD+Patent > License > > > > > > Hello, > > > > > > Based on review of the RFC V2, there are some > updates > > > required to > > > Readme.md in the root of the edk2 repository. > > > > > > Changes for V3 > > > =============== > > > * Move the portions of Contributions.txt in the root > of > > > edk2 to > > > Readme.md in the root of edk2 that describe how to > > > contribute > > > along with the commit message format. > > > > > > * Add to Readme.md in the root of edk2 that Signed- > off-by > > > means that > > > the contributor certifies compliance to the > Developer's > > > Certificate > > > of Origin 1.1. https://developercertificate.org > > > > > > Changes for V2 > > > =============== > > > * Replace 2-Clause BSD License in file headers with > SPDX- > > > License-Identifier > > > statement. This reduces the size of the file > headers > > > and the size > > > of the patches for this change. Based on the > following > > > post: > > > > > > https://01.org/blogs/jc415/2018/open-source-hacks- > one- > > > question-interviews-open-source-experts-how-use- > spdx- > > > headers > > > > > > * Update License.txt in root of edk2 before changing > file > > > headers. > > > * Fix minor typos > > > =============== > > > > > > This RFC follows up on the proposal from Mark Doran > to > > > change the > > > EDK II Project to a BSD+Patent License. > > > > > > https://lists.01.org/pipermail/edk2-devel/2019- > > > February/036260.html > > > > > > The review period for this license change is 30 > days. If > > > there is no > > > unresolved feedback on April 9, 2019, then commits > of the > > > license change > > > patches will begin on April 9, 2019. > > > > > > ** Please provide feedback on the proposal by > Monday > > > April 8, 2019. ** > > > > > > Feedback can be sent to edk2-devel at lists.01.org, > the > > > EDK II community > > > manager or any of the EDK II stewards. > > > > > > * Stephano Cetola <stephano.cetola at intel.com> > > > Community Manager > > > * Leif Lindholm <leif.lindholm at linaro.org> > > > Steward > > > * Andrew Fish <afish at apple.com> > > > Steward > > > * Laszlo Ersek <lersek at redhat.com> > > > Steward > > > * Michael Kinney <michael.d.kinney at intel.com> > > > Steward > > > > > > The goal is to convert all of the files in the edk2 > > > repository that are > > > currently covered by the 2-Clause BSD License and > the > > > TianoCore > > > Contribution Agreement to a BSD+Patent License. > > > > > > I will be following up with pointers to public > GitHub > > > branches that > > > contain the set of changes to the edk2 repository > for > > > review. > > > > > > The proposal is to perform this change to > edk2/master in > > > the steps listed > > > below. The license change will not be applied to any > of > > > the other existing > > > branches in the edk2 repository. > > > > > > 1) Add a License-History.txt file to the root of the > edk2 > > > repository that > > > contains the 2-Clause BSD License and the > TianoCore > > > Contribution > > > Agreement along with the details on the change to > the > > > BSD+Patent License. > > > > > > 2) Change License.txt in the root of the edk2 > repository > > > from a 2-Clause > > > BSD License to the BSD+Patent License. The > following > > > is the link to the > > > BSD+Patent License and the new License.txt file > > > contents. > > > > > > https://opensource.org/licenses/BSDplusPatent > > > > > > > > > > ======================================================== > = > > > ============= > > > Redistribution and use in source and binary > forms, > > > with or without > > > modification, are permitted provided that the > > > following conditions are met: > > > > > > 1. Redistributions of source code must retain the > > > above copyright notice, > > > this list of conditions and the following > > > disclaimer. > > > > > > 2. Redistributions in binary form must reproduce > the > > > above copyright notice, > > > this list of conditions and the following > > > disclaimer in the documentation > > > and/or other materials provided with the > > > distribution. > > > > > > Subject to the terms and conditions of this > license, > > > each copyright holder > > > and contributor hereby grants to those receiving > > > rights under this license > > > a perpetual, worldwide, non-exclusive, no-charge, > > > royalty-free, irrevocable > > > (except for failure to satisfy the conditions of > this > > > license) patent > > > license to make, have made, use, offer to sell, > sell, > > > import, and otherwise > > > transfer this software, where such license > applies > > > only to those patent > > > claims, already acquired or hereafter acquired, > > > licensable by such copyright > > > holder or contributor that are necessarily > infringed > > > by: > > > > > > (a) their Contribution(s) (the licensed > copyrights of > > > copyright holders and > > > non-copyrightable additions of contributors, > in > > > source or binary form) > > > alone; or > > > > > > (b) combination of their Contribution(s) with the > work > > > of authorship to > > > which such Contribution(s) was added by such > > > copyright holder or > > > contributor, if, at the time the Contribution > is > > > added, such addition > > > causes such combination to be necessarily > > > infringed. The patent license > > > shall not apply to any other combinations > which > > > include the > > > Contribution. > > > > > > Except as expressly stated above, no rights or > > > licenses from any copyright > > > holder or contributor is granted under this > license, > > > whether expressly, by > > > implication, estoppel or otherwise. > > > > > > DISCLAIMER > > > > > > THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT > HOLDERS AND > > > CONTRIBUTORS "AS IS" > > > AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, > BUT > > > NOT LIMITED TO, THE > > > IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > FOR > > > A PARTICULAR PURPOSE > > > ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > > > HOLDERS OR CONTRIBUTORS BE > > > LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > SPECIAL, > > > EXEMPLARY, OR > > > CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED > TO, > > > PROCUREMENT OF > > > SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, > OR > > > PROFITS; OR BUSINESS > > > INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > > LIABILITY, WHETHER IN > > > CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > > NEGLIGENCE OR OTHERWISE) > > > ARISING IN ANY WAY OUT OF THE USE OF THIS > SOFTWARE, > > > EVEN IF ADVISED OF THE > > > POSSIBILITY OF SUCH DAMAGE. > > > > > > > ======================================================== > = > > > ============= > > > > > > 3) Change all files currently covered by a 2-Clause > BSD > > > License and the > > > TianoCore Contribution Agreement to a BSD+Patent > > > License using the > > > following SPDX-License-Identifier statement: > > > > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > The use of SPDX-License-Identifier statement is > based > > > on the following: > > > > > > https://01.org/blogs/jc415/2018/open-source- > > > hacks-one-question-interviews-open-source-experts- > how- > > > use-spdx-headers > > > > > > 4) Update Readme.md in the root of the edk2 > repository to > > > state that content > > > is covered by a BSD+Patent License. Also state > that > > > the BSD+Patent License > > > is the preferred license for the EDK II project. > > > > > > a) Move the portions of Contributions.txt in the > root > > > of the edk2 repository > > > Readme.md in the root of edk2 repository that > > > describe how to contribute > > > along with the commit message format. > > > > > > b) Add the following to Readme.md in the root of > edk2 > > > repository: > > > > > > # Developer Certificate of Origin > > > > > > Your change description should use the standard > > > format for a > > > commit message, and must include your `Signed- > off- > > > by` signature. > > > > > > In order to keep track of who did what, all > patches > > > contributed must > > > include a statement that to the best of the > > > contributor's knowledge > > > they have the right to contribute it under the > > > specified license. > > > > > > The test for this is as specified in the > > > [Developer's Certificate of > > > Origin (DCO) > > > 1.1](https://developercertificate.org/). The > contributor > > > certifies compliance by adding a line saying > > > > > > Signed-off-by: Developer Name > > > <develo...@example.org> > > > > > > where `Developer Name` is the contributor's > real > > > name, and the email > > > address is one the developer is reachable > through at > > > the time of > > > contributing. > > > > > > ``` > > > Developer's Certificate of Origin 1.1 > > > > > > By making a contribution to this project, I > certify > > > that: > > > > > > (a) The contribution was created in whole or > in > > > part by me and I > > > have the right to submit it under the open > > > source license > > > indicated in the file; or > > > > > > (b) The contribution is based upon previous > work > > > that, to the best > > > of my knowledge, is covered under an > appropriate > > > open source > > > license and I have the right under that > license > > > to submit that > > > work with modifications, whether created in > > > whole or in part > > > by me, under the same open source license > > > (unless I am > > > permitted to submit under a different > license), > > > as indicated > > > in the file; or > > > > > > (c) The contribution was provided directly to > me by > > > some other > > > person who certified (a), (b) or (c) and I > have > > > not modified > > > it. > > > > > > (d) I understand and agree that this project > and > > > the contribution > > > are public and that a record of the > contribution > > > (including all > > > personal information I submit with it, > including > > > my sign-off) is > > > maintained indefinitely and may be > redistributed > > > consistent with > > > this project or the open source license(s) > > > involved. > > > ``` > > > > > > 5) Remove the Contributions.txt file from the root > of the > > > edk2 repository > > > that contains the TianoCore Contribution > Agreement. > > > > > > 6) Update all documentation to state that content > > > submitted under the > > > BSD+Patent License no longer requires the > Tianocore > > > Contribution > > > Agreement which means the following line is not > > > required in commit > > > messages for changes to files that are covered by > a > > > BSD+Patent License. > > > > > > Contributed-under: TianoCore Contribution > > > Agreement 1.1 > > > > > > 7) Create Wiki page(s) that provide the details of > the > > > BSD+Patent License > > > change and provides the status of the license > change > > > for each TianoCore > > > repository and package. > > > > > > Once the conversion of the edk2 repository is > complete, > > > work will begin > > > on the other repositories in the TianoCore project. > > > > > > Best regards, > > > > > > Mike > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
