diff options
author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-03 16:03:44 -0700 |
---|---|---|
committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-09 10:57:59 -0700 |
commit | e3ba31da1cd1c4ab924f7f9787247cb6679bcffe (patch) | |
tree | fb8a75ea81e0ed29f539715fcee1cb6e1dc5bcae /EmulatorPkg/EmuSnpDxe | |
parent | 878b807a435eefbb1d76f9bdec30cb3526521a5e (diff) | |
download | edk2-e3ba31da1cd1c4ab924f7f9787247cb6679bcffe.tar.gz edk2-e3ba31da1cd1c4ab924f7f9787247cb6679bcffe.tar.bz2 edk2-e3ba31da1cd1c4ab924f7f9787247cb6679bcffe.zip |
EmulatorPkg: 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 <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Diffstat (limited to 'EmulatorPkg/EmuSnpDxe')
-rw-r--r-- | EmulatorPkg/EmuSnpDxe/ComponentName.c | 8 | ||||
-rw-r--r-- | EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c | 8 | ||||
-rw-r--r-- | EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h | 8 | ||||
-rw-r--r-- | EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf | 8 |
4 files changed, 4 insertions, 28 deletions
diff --git a/EmulatorPkg/EmuSnpDxe/ComponentName.c b/EmulatorPkg/EmuSnpDxe/ComponentName.c index a7c5124cff..19424bb34b 100644 --- a/EmulatorPkg/EmuSnpDxe/ComponentName.c +++ b/EmulatorPkg/EmuSnpDxe/ComponentName.c @@ -2,13 +2,7 @@ Copyright (c) 2010, Apple, Inc. 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.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c index 967da9900a..8e7c5331ff 100644 --- a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c +++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.c @@ -3,13 +3,7 @@ Copyright (c) 2010, Apple, Inc. All rights reserved.<BR>
Copyright (c) 2011, 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.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h index e2b3c303bf..6eb9a740b2 100644 --- a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h +++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.h @@ -2,13 +2,7 @@ Copyright (c) 2010, Apple, Inc. 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.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf index 17621e76af..e570a4f79b 100644 --- a/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf +++ b/EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf @@ -4,13 +4,7 @@ # Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2010, Apple, Inc. 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.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
|