[patch v2 0/2] Remove duplicated BSD license

[patch v2 0/2] Remove duplicated BSD license

[Dandan Bi]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612

V2: Keep Microsoft copyright in patch 0001, which is deleted
by mistake in V1.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Dandan Bi (2):
  SecurityPkg: Remove duplicated BSD license
  Vlv2TbltDevicePkg: Remove duplicated BSD license

 .../Ppi/FirmwareVolumeInfoPrehashedFV.h       | 28 ++-----------------
 .../Library/I2CLib/I2CLibNull.inf             | 10 +------
 2 files changed, 3 insertions(+), 35 deletions(-)

-- 
2.18.0.windows.1

[patch v2 1/2] SecurityPkg: Remove duplicated BSD license

[Dandan Bi]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612

V2: Keep Microsoft copyright, which is deleted by mistake in V1.

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       | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
index 23a56715ca..5fe3579eed 100644
--- a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
+++ b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h
@@ -1,43 +1,19 @@
 /** @file
 PPI to describe all hash digests for a given FV
 
+Copyright (c) 2017, Microsoft Corporation
 Copyright (c) 2017, 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
 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.
 
-**/
-/**
-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

[patch v2 2/2] Vlv2TbltDevicePkg: Remove duplicated BSD license

[Dandan Bi]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612

V2 is the same with V1.

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>
Reviewed-by: Zailiang Sun <zailiang.sun@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

Re: [patch v2 0/2] Remove duplicated BSD license

[Zhang, Chao B]

Reviewed-by : Chao Zhang <chao.b.zhang@intel.com>

-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Dandan Bi
Sent: Tuesday, March 12, 2019 9:20 AM
To: edk2-devel@lists.01.org
Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [edk2] [patch v2 0/2] Remove duplicated BSD license

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1612

V2: Keep Microsoft copyright in patch 0001, which is deleted by mistake in V1.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Dandan Bi (2):
  SecurityPkg: Remove duplicated BSD license
  Vlv2TbltDevicePkg: Remove duplicated BSD license

 .../Ppi/FirmwareVolumeInfoPrehashedFV.h       | 28 ++-----------------
 .../Library/I2CLib/I2CLibNull.inf             | 10 +------
 2 files changed, 3 insertions(+), 35 deletions(-)

--
2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel