From ecf98fbcf858b9cb09ff0ac1c2a09c0111b4026b Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Wed, 3 Apr 2019 16:06:13 -0700 Subject: NetworkPkg: Replace BSD License with BSD+Patent License 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 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Siyuan Fu --- NetworkPkg/Include/Guid/HttpBootConfigHii.h | 8 +------- NetworkPkg/Include/Guid/HttpTlsCipherList.h | 8 +------- NetworkPkg/Include/Guid/IScsiConfigHii.h | 8 +------- NetworkPkg/Include/Guid/Ip6ConfigHii.h | 8 +------- NetworkPkg/Include/Guid/TlsAuthConfigHii.h | 8 +------- NetworkPkg/Include/Guid/TlsAuthentication.h | 8 +------- NetworkPkg/Include/Guid/WifiConnectionManagerConfigHii.h | 8 +------- 7 files changed, 7 insertions(+), 49 deletions(-) (limited to 'NetworkPkg/Include') diff --git a/NetworkPkg/Include/Guid/HttpBootConfigHii.h b/NetworkPkg/Include/Guid/HttpBootConfigHii.h index cb12445244..88fd422567 100644 --- a/NetworkPkg/Include/Guid/HttpBootConfigHii.h +++ b/NetworkPkg/Include/Guid/HttpBootConfigHii.h @@ -2,13 +2,7 @@ GUIDs used as HII FormSet and HII Package list GUID in HTTP boot driver. Copyright (c) 2016 - 2018, 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 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. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/NetworkPkg/Include/Guid/HttpTlsCipherList.h b/NetworkPkg/Include/Guid/HttpTlsCipherList.h index c648f67576..1dffe9497a 100644 --- a/NetworkPkg/Include/Guid/HttpTlsCipherList.h +++ b/NetworkPkg/Include/Guid/HttpTlsCipherList.h @@ -2,13 +2,7 @@ This file defines the HttpTlsCipherList variable for HTTPS to configure Tls Cipher List. Copyright (c) 2018 - 2018, 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 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. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/NetworkPkg/Include/Guid/IScsiConfigHii.h b/NetworkPkg/Include/Guid/IScsiConfigHii.h index e5a7d131b8..d63ef208b1 100644 --- a/NetworkPkg/Include/Guid/IScsiConfigHii.h +++ b/NetworkPkg/Include/Guid/IScsiConfigHii.h @@ -3,13 +3,7 @@ that supports IP4 and IP6 both. Copyright (c) 2011 - 2018, 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 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. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/NetworkPkg/Include/Guid/Ip6ConfigHii.h b/NetworkPkg/Include/Guid/Ip6ConfigHii.h index eefcd016f0..da26d03069 100644 --- a/NetworkPkg/Include/Guid/Ip6ConfigHii.h +++ b/NetworkPkg/Include/Guid/Ip6ConfigHii.h @@ -2,13 +2,7 @@ GUIDs used as HII FormSet and HII Package list GUID in Ip6Config driver. Copyright (c) 2011 - 2018, 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 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. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/NetworkPkg/Include/Guid/TlsAuthConfigHii.h b/NetworkPkg/Include/Guid/TlsAuthConfigHii.h index 5e5637c4c6..fd2de001af 100644 --- a/NetworkPkg/Include/Guid/TlsAuthConfigHii.h +++ b/NetworkPkg/Include/Guid/TlsAuthConfigHii.h @@ -2,13 +2,7 @@ GUIDs used as HII FormSet and HII Package list GUID in TlsAuthConfigDxe driver. Copyright (c) 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 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. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/NetworkPkg/Include/Guid/TlsAuthentication.h b/NetworkPkg/Include/Guid/TlsAuthentication.h index e8497be68b..e6646a65ef 100644 --- a/NetworkPkg/Include/Guid/TlsAuthentication.h +++ b/NetworkPkg/Include/Guid/TlsAuthentication.h @@ -2,13 +2,7 @@ This file defines TlsCaCertificate variable. Copyright (c) 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 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. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/NetworkPkg/Include/Guid/WifiConnectionManagerConfigHii.h b/NetworkPkg/Include/Guid/WifiConnectionManagerConfigHii.h index af150784f8..6d2b1344b0 100644 --- a/NetworkPkg/Include/Guid/WifiConnectionManagerConfigHii.h +++ b/NetworkPkg/Include/Guid/WifiConnectionManagerConfigHii.h @@ -2,13 +2,7 @@ GUIDs used as HII FormSet and HII Package list GUID in WiFi Connection Manager. Copyright (c) 2019, 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 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. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ -- cgit v1.2.3