Hi Dandan, The copyright line should be preserved and put with the other copyright line.
Mike > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] > On Behalf Of Dandan Bi > Sent: Sunday, March 10, 2019 11:23 PM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D <michael.d.kin...@intel.com>; Gao, > Liming <liming....@intel.com>; Zhang, Chao B > <chao.b.zh...@intel.com> > Subject: [edk2] [patch 1/2] SecurityPkg: Remove > duplicated BSD license > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612 > > Cc: Chao Zhang <chao.b.zh...@intel.com> > Cc: Jian Wang <jian.j.w...@intel.com> > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Dandan Bi <dandan...@intel.com> > --- > .../Ppi/FirmwareVolumeInfoPrehashedFV.h | 26 ----- > -------------- > 1 file changed, 26 deletions(-) > > diff --git > a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > index 23a56715ca..9a02c429ac 100644 > --- > a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > +++ > b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h > @@ -8,36 +8,10 @@ which accompanies this distribution. > The full text of the license may be found > http://opensource.org/licenses/bsd-license.php > > THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN > "AS IS" BASIS, > WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, > EITHER EXPRESS OR IMPLIED. > > -**/ > -/** > -PPI to describe all hash digests for a given FV > - > -Copyright (c) 2017, Microsoft Corporation > - > -All rights reserved. > -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. > - > -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. > - > **/ > > #ifndef __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ > #define __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ > > -- > 2.18.0.windows.1 > > _______________________________________________ > 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
