* [patch 0/2] Remove duplicated BSD license @ 2019-03-11 6:23 Dandan Bi 2019-03-11 6:23 ` [patch 1/2] SecurityPkg: " Dandan Bi 2019-03-11 6:23 ` [patch 2/2] Vlv2TbltDevicePkg: " Dandan Bi 0 siblings, 2 replies; 5+ messages in thread From: Dandan Bi @ 2019-03-11 6:23 UTC (permalink / raw) To: edk2-devel; +Cc: Michael D Kinney, Liming Gao REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612 Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com> Dandan Bi (2): SecurityPkg: Remove the duplicated BSD license Vlv2TbltDevicePkg: Remove the duplicated BSD license .../Ppi/FirmwareVolumeInfoPrehashedFV.h | 26 ------------------- .../Library/I2CLib/I2CLibNull.inf | 10 +------ 2 files changed, 1 insertion(+), 35 deletions(-) -- 2.18.0.windows.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [patch 1/2] SecurityPkg: Remove duplicated BSD license 2019-03-11 6:23 [patch 0/2] Remove duplicated BSD license Dandan Bi @ 2019-03-11 6:23 ` Dandan Bi 2019-03-11 15:54 ` Kinney, Michael D 2019-03-11 6:23 ` [patch 2/2] Vlv2TbltDevicePkg: " Dandan Bi 1 sibling, 1 reply; 5+ messages in thread From: Dandan Bi @ 2019-03-11 6:23 UTC (permalink / raw) To: edk2-devel; +Cc: Chao Zhang, Jian Wang, Michael D Kinney, Liming Gao REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612 Cc: Chao Zhang <chao.b.zhang@intel.com> Cc: Jian Wang <jian.j.wang@intel.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi <dandan.bi@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [patch 1/2] SecurityPkg: Remove duplicated BSD license 2019-03-11 6:23 ` [patch 1/2] SecurityPkg: " Dandan Bi @ 2019-03-11 15:54 ` Kinney, Michael D 0 siblings, 0 replies; 5+ messages in thread From: Kinney, Michael D @ 2019-03-11 15:54 UTC (permalink / raw) To: Bi, Dandan, edk2-devel@lists.01.org, Kinney, Michael D Cc: Gao, Liming, Zhang, Chao B Hi Dandan, The copyright line should be preserved and put with the other copyright line. Mike > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@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.kinney@intel.com>; Gao, > Liming <liming.gao@intel.com>; Zhang, Chao B > <chao.b.zhang@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.zhang@intel.com> > Cc: Jian Wang <jian.j.wang@intel.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Dandan Bi <dandan.bi@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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [patch 2/2] Vlv2TbltDevicePkg: Remove duplicated BSD license 2019-03-11 6:23 [patch 0/2] Remove duplicated BSD license Dandan Bi 2019-03-11 6:23 ` [patch 1/2] SecurityPkg: " Dandan Bi @ 2019-03-11 6:23 ` Dandan Bi 2019-03-11 6:31 ` Sun, Zailiang 1 sibling, 1 reply; 5+ messages in thread From: Dandan Bi @ 2019-03-11 6:23 UTC (permalink / raw) To: edk2-devel; +Cc: Zailiang Sun, Yi Qian, Michael D Kinney, Liming Gao REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612 Cc: Zailiang Sun <zailiang.sun@intel.com> Cc: Yi Qian <yi.qian@intel.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi <dandan.bi@intel.com> --- Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf b/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf index 6e1496bcf5..32959d9bd5 100644 --- a/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf +++ b/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf @@ -1,23 +1,15 @@ ## @file # Null instance of Debug Agent Library with empty functions. # # Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR> -# -# This program and the accompanying materials are licensed and made available under -# the terms and conditions of the BSD License that accompanies this distribution. -# The full text of the license may be found at -# 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. -# # # 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 PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # # -- 2.18.0.windows.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [patch 2/2] Vlv2TbltDevicePkg: Remove duplicated BSD license 2019-03-11 6:23 ` [patch 2/2] Vlv2TbltDevicePkg: " Dandan Bi @ 2019-03-11 6:31 ` Sun, Zailiang 0 siblings, 0 replies; 5+ messages in thread From: Sun, Zailiang @ 2019-03-11 6:31 UTC (permalink / raw) To: Bi, Dandan, edk2-devel@lists.01.org Cc: Qian, Yi, Kinney, Michael D, Gao, Liming Reviewed-by: Zailiang Sun <zailiang.sun@intel.com> > -----Original Message----- > From: Bi, Dandan > Sent: Monday, March 11, 2019 2:23 PM > To: edk2-devel@lists.01.org > Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>; > Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming > <liming.gao@intel.com> > Subject: [patch 2/2] Vlv2TbltDevicePkg: Remove duplicated BSD license > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612 > > Cc: Zailiang Sun <zailiang.sun@intel.com> > Cc: Yi Qian <yi.qian@intel.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Dandan Bi <dandan.bi@intel.com> > --- > Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf > b/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf > index 6e1496bcf5..32959d9bd5 100644 > --- a/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf > +++ b/Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf > @@ -1,23 +1,15 @@ > ## @file > # Null instance of Debug Agent Library with empty functions. > # > # Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR> > -# > > -# This program and the accompanying materials are licensed and made > available under > > -# the terms and conditions of the BSD License that accompanies this > distribution. > > -# The full text of the license may be found at > > -# 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. > > -# > > # > # 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 PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, > EITHER EXPRESS OR IMPLIED. > # > # > > -- > 2.18.0.windows.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-11 15:54 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-03-11 6:23 [patch 0/2] Remove duplicated BSD license Dandan Bi 2019-03-11 6:23 ` [patch 1/2] SecurityPkg: " Dandan Bi 2019-03-11 15:54 ` Kinney, Michael D 2019-03-11 6:23 ` [patch 2/2] Vlv2TbltDevicePkg: " Dandan Bi 2019-03-11 6:31 ` Sun, Zailiang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox