[edk2-devel] [[edk2-platforms][PATCH V2] 06/30] Platform/Comcast: Replace BSD License with BSD+Patent License

Michael D Kinney posted 1 patch 1 week ago
Failed in applying to current master (apply log)
Platform/Comcast/Application/Dri/Dri.c                    | 8 +-------
Platform/Comcast/Application/Dri/Dri.inf                  | 8 +-------
.../Comcast/Application/DriSecureBoot/DriSecureBoot.c     | 8 +-------
.../Comcast/Application/DriSecureBoot/DriSecureBoot.inf   | 8 +-------
Platform/Comcast/Application/SecureBoot/SecureBoot.c      | 8 +-------
Platform/Comcast/Application/SecureBoot/SecureBoot.inf    | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c       | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c     | 8 +-------
.../Library/RdkBootManagerLib/RdkBootManagerLib.dec       | 8 +-------
.../Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h | 8 +-------
.../Library/RdkBootManagerLib/RdkBootManagerLib.inf       | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c      | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c   | 8 +-------
Platform/Comcast/RDKQemu/RDKQemu.dsc                      | 8 +-------
Platform/Comcast/RDKQemu/RDKQemu.fdf                      | 8 +-------
15 files changed, 15 insertions(+), 105 deletions(-)

[edk2-devel] [[edk2-platforms][PATCH V2] 06/30] Platform/Comcast: Replace BSD License with BSD+Patent License

Posted by Michael D Kinney 1 week ago
https://bugzilla.tianocore.org/show_bug.cgi?id=1373

Replace BSD 2-Clause License with BSD+Patent License.  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

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 Platform/Comcast/Application/Dri/Dri.c                    | 8 +-------
 Platform/Comcast/Application/Dri/Dri.inf                  | 8 +-------
 .../Comcast/Application/DriSecureBoot/DriSecureBoot.c     | 8 +-------
 .../Comcast/Application/DriSecureBoot/DriSecureBoot.inf   | 8 +-------
 Platform/Comcast/Application/SecureBoot/SecureBoot.c      | 8 +-------
 Platform/Comcast/Application/SecureBoot/SecureBoot.inf    | 8 +-------
 Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c       | 8 +-------
 Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c     | 8 +-------
 .../Library/RdkBootManagerLib/RdkBootManagerLib.dec       | 8 +-------
 .../Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h | 8 +-------
 .../Library/RdkBootManagerLib/RdkBootManagerLib.inf       | 8 +-------
 Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c      | 8 +-------
 Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c   | 8 +-------
 Platform/Comcast/RDKQemu/RDKQemu.dsc                      | 8 +-------
 Platform/Comcast/RDKQemu/RDKQemu.fdf                      | 8 +-------
 15 files changed, 15 insertions(+), 105 deletions(-)

diff --git a/Platform/Comcast/Application/Dri/Dri.c b/Platform/Comcast/Application/Dri/Dri.c
index 4e5ede2e0c..a958b641d8 100644
--- a/Platform/Comcast/Application/Dri/Dri.c
+++ b/Platform/Comcast/Application/Dri/Dri.c
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
  */
 #include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Application/Dri/Dri.inf b/Platform/Comcast/Application/Dri/Dri.inf
index ba0656cbc6..518ac3d671 100644
--- a/Platform/Comcast/Application/Dri/Dri.inf
+++ b/Platform/Comcast/Application/Dri/Dri.inf
@@ -2,13 +2,7 @@
 #  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016-2017, Comcast. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 ################################################################################
diff --git a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c
index 1ebead919a..b389e0e87b 100644
--- a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c
+++ b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
  */
 #include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf
index 39d25e5028..208daaef21 100644
--- a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf
+++ b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf
@@ -2,13 +2,7 @@
 #  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016-2017, Comcast. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 ################################################################################
diff --git a/Platform/Comcast/Application/SecureBoot/SecureBoot.c b/Platform/Comcast/Application/SecureBoot/SecureBoot.c
index d26d982fe1..c1463f69ef 100644
--- a/Platform/Comcast/Application/SecureBoot/SecureBoot.c
+++ b/Platform/Comcast/Application/SecureBoot/SecureBoot.c
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
  */
 #include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Application/SecureBoot/SecureBoot.inf b/Platform/Comcast/Application/SecureBoot/SecureBoot.inf
index ad4b6ad1f6..79028da2b1 100644
--- a/Platform/Comcast/Application/SecureBoot/SecureBoot.inf
+++ b/Platform/Comcast/Application/SecureBoot/SecureBoot.inf
@@ -2,13 +2,7 @@
 #  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016-2017, Comcast. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 ################################################################################
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
index 1e009e88d1..ed893bd5af 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 */
 #include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c b/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c
index 85f7104045..e98b338e6d 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 */
 #include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec
index c30ec61f6e..e83fc0e556 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec
@@ -1,13 +1,7 @@
 #
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 [Defines]
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h
index 6a18e95c1c..5af19e5041 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 */
 #ifndef __RDK_BOOT_MANAGER_LIB_H__
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
index 9f20d447f4..286a773dd6 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
@@ -2,13 +2,7 @@
 #  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2016-2017, Comcast. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 ################################################################################
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
index c398d4b499..dd69565102 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 */
 #include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c b/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c
index f063ccfbeb..d2410ada94 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c
@@ -1,13 +1,7 @@
 /*
 #  Copyright (c) 2014-2018, Linaro Limited. 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 */
 #include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index f22f14aed9..75b835ce60 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -3,13 +3,7 @@
 #  Copyright (c) 2014 - 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2015 - 2016, 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
 
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.fdf b/Platform/Comcast/RDKQemu/RDKQemu.fdf
index 2ff7bef08a..953a72c955 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.fdf
+++ b/Platform/Comcast/RDKQemu/RDKQemu.fdf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2014 - 2018, Linaro Limited. All rights reserved.
 #  Copyright (c) 2015 - 2016, 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
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 ################################################################################
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40719): https://edk2.groups.io/g/devel/message/40719
Mute This Topic: https://groups.io/mt/31635477/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-