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>

diff --git a/ShellBinPkg/MinUefiShell/MinUefiShell.inf b/ShellBinPkg/MinUefiShell/MinUefiShell.inf
index 62b586c4bac9dbb553c8ae8f9ab729cf787ad1f3..c11804ce2bff4928d6e0fdaa413959649afd8ad1 100644 (file)
--- a/ShellBinPkg/MinUefiShell/MinUefiShell.inf
+++ b/ShellBinPkg/MinUefiShell/MinUefiShell.inf
@@ -3,12 +3,7 @@
 #\r
 #  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #\r
 #  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution. The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 #\r
 ##\r
 #\r
 #\r
 ##\r

diff --git a/ShellBinPkg/ShellBinPkg.dec b/ShellBinPkg/ShellBinPkg.dec
index 34575ab15b1afdfc2ac3d50e4642da1749cf67ce..c3b75c1cd47e2c9e15c852c1803ed5e1fdf5d802 100644 (file)
--- a/ShellBinPkg/ShellBinPkg.dec
+++ b/ShellBinPkg/ShellBinPkg.dec
@@ -5,11 +5,7 @@
 # UEFI specification and UEFI Shell 2.0 specification.\r
 # Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # UEFI specification and UEFI Shell 2.0 specification.\r
 # Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r

-#    This program and the accompanying materials are licensed and made available\r
-#    under the terms and conditions of the BSD License which accompanies this distribution.\r
-#    The full text of the license may be found at http://opensource.org/licenses/bsd-license.php\r
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES\r
-#    OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#    SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/ShellBinPkg/UefiShell/UefiShell.inf b/ShellBinPkg/UefiShell/UefiShell.inf
index 62b586c4bac9dbb553c8ae8f9ab729cf787ad1f3..c11804ce2bff4928d6e0fdaa413959649afd8ad1 100644 (file)
--- a/ShellBinPkg/UefiShell/UefiShell.inf
+++ b/ShellBinPkg/UefiShell/UefiShell.inf
@@ -3,12 +3,7 @@
 #\r
 #  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #\r
 #  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution. The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 #\r
 ##\r
 #\r
 #\r
 ##\r