On 2016-04-06 08:14:50, Jordan Justen wrote: > The script replaced the contents of License.txt will the words the > shortened text that we include in the headers to files. Instead, use > the full text. This is copied from MdePkg/License.txt. >
In a reply to the cover-letter email, Ray wrote "The commit message for patch 1 looks strange. I cannot fully understand it." Ray, how about this instead? === FatPkg: Update License.txt to have the full license text A script was used to convert the license text for the entire FatPkg. It used the shorter BSD text that we use in most files: This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php The script also used the short version in FatPkg/License.txt. In each package's License.txt, we normally include the full BSD license text. This change copies the longer version of License.txt from MdePkg. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> === -Jordan > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Ruiyu Ni <ruiyu...@intel.com> > --- > FatPkg/License.txt | 29 ++++++++++++++++++++++------- > 1 file changed, 22 insertions(+), 7 deletions(-) > > diff --git a/FatPkg/License.txt b/FatPkg/License.txt > index 2bed9de..be68999 100644 > --- a/FatPkg/License.txt > +++ b/FatPkg/License.txt > @@ -1,10 +1,25 @@ > -Copyright (c) 2006, Intel Corporation. All rights reserved. > +Copyright (c) 2012, Intel Corporation. All rights reserved. > > -This program and the accompanying materials are licensed and made available > -under the terms and conditions of the BSD License which accompanies this > -distribution. The full text of the license may be found at > -http://opensource.org/licenses/bsd-license.php > +Redistribution and use in source and binary forms, with or without > +modification, are permitted provided that the following conditions > +are met: > > -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > +* Redistributions of source code must retain the above copyright > + notice, this list of conditions and the following disclaimer. > +* 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. > > +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 HOLDER 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. > -- > 2.7.0 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
