diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-03 16:06:57 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-09 10:58:24 -0700 |
| commit | 616bb7577171dafc123f5a57d0a46d91e64e5d50 (patch) | |
| tree | 2dea26e931aa5f4b1acf7a2784c7b6baf3772b0c /ShellBinPkg | |
| parent | 289b714b77008aa4200c0be25c4b4e25df04955a (diff) | |
| download | edk2-616bb7577171dafc123f5a57d0a46d91e64e5d50.tar.gz edk2-616bb7577171dafc123f5a57d0a46d91e64e5d50.tar.bz2 edk2-616bb7577171dafc123f5a57d0a46d91e64e5d50.zip | |
ShellBinPkg: 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>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'ShellBinPkg')
| -rw-r--r-- | ShellBinPkg/MinUefiShell/MinUefiShell.inf | 7 | ||||
| -rw-r--r-- | ShellBinPkg/ShellBinPkg.dec | 6 | ||||
| -rw-r--r-- | ShellBinPkg/UefiShell/UefiShell.inf | 7 |
3 files changed, 3 insertions, 17 deletions
diff --git a/ShellBinPkg/MinUefiShell/MinUefiShell.inf b/ShellBinPkg/MinUefiShell/MinUefiShell.inf index 62b586c4ba..c11804ce2b 100644 --- a/ShellBinPkg/MinUefiShell/MinUefiShell.inf +++ b/ShellBinPkg/MinUefiShell/MinUefiShell.inf @@ -3,12 +3,7 @@ #
# 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
#
#
##
diff --git a/ShellBinPkg/ShellBinPkg.dec b/ShellBinPkg/ShellBinPkg.dec index 34575ab15b..c3b75c1cd4 100644 --- a/ShellBinPkg/ShellBinPkg.dec +++ b/ShellBinPkg/ShellBinPkg.dec @@ -5,11 +5,7 @@ # UEFI specification and UEFI Shell 2.0 specification.
# 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
#
##
diff --git a/ShellBinPkg/UefiShell/UefiShell.inf b/ShellBinPkg/UefiShell/UefiShell.inf index 62b586c4ba..c11804ce2b 100644 --- a/ShellBinPkg/UefiShell/UefiShell.inf +++ b/ShellBinPkg/UefiShell/UefiShell.inf @@ -3,12 +3,7 @@ #
# 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
#
#
##
|