diff options
author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-03 16:07:42 -0700 |
---|---|---|
committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-09 10:58:32 -0700 |
commit | bcb966958adc277a9f755ee61d9a61a23fb94740 (patch) | |
tree | 640b24132e345c33c46531248b09210ec760697a /AppPkg/Applications/Hello | |
parent | 9dc8036ddf6f8e9af166595d5eb5f5ea9b6d9dcc (diff) | |
download | edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.tar.gz edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.tar.bz2 edk2-bcb966958adc277a9f755ee61d9a61a23fb94740.zip |
AppPkg: 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: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'AppPkg/Applications/Hello')
-rw-r--r-- | AppPkg/Applications/Hello/Hello.c | 8 | ||||
-rw-r--r-- | AppPkg/Applications/Hello/Hello.inf | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/AppPkg/Applications/Hello/Hello.c b/AppPkg/Applications/Hello/Hello.c index a16b27633d..2a67e3415a 100644 --- a/AppPkg/Applications/Hello/Hello.c +++ b/AppPkg/Applications/Hello/Hello.c @@ -3,13 +3,7 @@ we can build applications without LibC.
Copyright (c) 2010 - 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.
-
- 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
**/
#include <Uefi.h>
#include <Library/UefiLib.h>
diff --git a/AppPkg/Applications/Hello/Hello.inf b/AppPkg/Applications/Hello/Hello.inf index 20782f7b1a..eed6456f7c 100644 --- a/AppPkg/Applications/Hello/Hello.inf +++ b/AppPkg/Applications/Hello/Hello.inf @@ -2,13 +2,7 @@ # A simple, basic, EDK II native, "hello" application.
#
# Copyright (c) 2010 - 2018, 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.
-#
-# 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
#
##
|