From 616bb7577171dafc123f5a57d0a46d91e64e5d50 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Wed, 3 Apr 2019 16:06:57 -0700 Subject: [PATCH] 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 Reviewed-by: Ray Ni Reviewed-by: Jaben Carsey --- ShellBinPkg/MinUefiShell/MinUefiShell.inf | 7 +------ ShellBinPkg/ShellBinPkg.dec | 6 +----- 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.
# -# 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.
# -# 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.
# -# 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 # # ## -- 2.39.2