ShellBinPkg: Replace BSD License with BSD+Patent License

mdkinney · mdkinney · commit fdb651095579 · 2019-04-03T16:06:57.000-07:00
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>
diff --git 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
@@ -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
@@ -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
 #
 #
 ##

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>`
`5`	`5`	`#`
`6`		`-# This program and the accompanying materials`
`7`		`-# are licensed and made available under the terms and conditions of the BSD License`
`8`		`-# which accompanies this distribution. The full text of the license may be found at`
`9`		`-# http://opensource.org/licenses/bsd-license.php`
`10`		`-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,`
`11`		`-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.`
	`6`	`+# SPDX-License-Identifier: BSD-2-Clause-Patent`
`12`	`7`	`#`
`13`	`8`	`#`
`14`	`9`	`##`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,7 @@`
`5`	`5`	`# UEFI specification and UEFI Shell 2.0 specification.`
`6`	`6`	`# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>`
`7`	`7`	`#`
`8`		`-# This program and the accompanying materials are licensed and made available`
`9`		`-# under the terms and conditions of the BSD License which accompanies this distribution.`
`10`		`-# The full text of the license may be found at http://opensource.org/licenses/bsd-license.php`
`11`		`-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES`
`12`		`-# OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.`
	`8`	`+# SPDX-License-Identifier: BSD-2-Clause-Patent`
`13`	`9`	`#`
`14`	`10`	`##`
`15`	`11`