summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael D Kinney <michael.d.kinney@intel.com>2019-04-03 16:02:46 -0700
committerMichael D Kinney <michael.d.kinney@intel.com>2019-04-09 09:10:18 -0700
commit9ca2b9b9abeff5db9da35dc8a506e7ebd632655f (patch)
tree6969cd63b26c0b041e0e2d9e1c23e3bd259d77fe
parent304bff7223a89ef87d77b3f77e195cb44a45e30b (diff)
downloadedk2-9ca2b9b9abeff5db9da35dc8a506e7ebd632655f.tar.gz
edk2-9ca2b9b9abeff5db9da35dc8a506e7ebd632655f.tar.bz2
edk2-9ca2b9b9abeff5db9da35dc8a506e7ebd632655f.zip
edk2: 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: Laszlo Ersek <lersek@redhat.com>
-rwxr-xr-xedksetup.bat8
-rwxr-xr-xedksetup.sh8
2 files changed, 2 insertions, 14 deletions
diff --git a/edksetup.bat b/edksetup.bat
index a493afa7ce..662ffc0060 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -3,13 +3,7 @@
@REM
@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@REM set CYGWIN_HOME=C:\cygwin
diff --git a/edksetup.sh b/edksetup.sh
index 39f62a29bd..c7b2e1e201 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -1,13 +1,7 @@
#
# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2016, Linaro Ltd. 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
#
# In *inux environment, the build tools's source is required and need to be compiled
# firstly, please reference https://github.com/tianocore/tianocore.github.io/wiki/SourceForge-to-Github-Quick-Start