Skip to content

Commit 75c4e96

Browse files
committed
edk2: Change License.txt from 2-Clause BSD to BSD+Patent
Change License.txt in the root of the edk2 repository from the 2-Clause BSD License to the BSD+Patent License. https://bugzilla.tianocore.org/show_bug.cgi?id=1373 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: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html Branch for review: https://github.com/mdkinney/edk2/tree/Bug_1373_BsdPatentLicense Cc: Leif Lindholm <[email protected]> Cc: Andrew Fish <[email protected]> Cc: Laszlo Ersek <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <[email protected]>
1 parent 1daf0f1 commit 75c4e96

File tree

1 file changed

+48
-22
lines changed

1 file changed

+48
-22
lines changed

License.txt

+48-22
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,55 @@
1-
Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
1+
Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
22
Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
33
Copyright (c) 2011 - 2015, ARM Limited. All rights reserved.
44
Copyright (c) 2014 - 2015, Linaro Limited. All rights reserved.
55
Copyright (c) 2013 - 2015, Red Hat, Inc.
66

7+
SPDX-License-Identifier: BSD-2-Clause-Patent
8+
79
Redistribution and use in source and binary forms, with or without
8-
modification, are permitted provided that the following conditions
9-
are met:
10-
11-
* Redistributions of source code must retain the above copyright
12-
notice, this list of conditions and the following disclaimer.
13-
* Redistributions in binary form must reproduce the above copyright
14-
notice, this list of conditions and the following disclaimer in
15-
the documentation and/or other materials provided with the
16-
distribution.
17-
18-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
21-
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
22-
COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
23-
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24-
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
28-
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
10+
modification, are permitted provided that the following conditions are met:
11+
12+
1. Redistributions of source code must retain the above copyright notice,
13+
this list of conditions and the following disclaimer.
14+
15+
2. Redistributions in binary form must reproduce the above copyright notice,
16+
this list of conditions and the following disclaimer in the documentation
17+
and/or other materials provided with the distribution.
18+
19+
Subject to the terms and conditions of this license, each copyright holder
20+
and contributor hereby grants to those receiving rights under this license
21+
a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
22+
(except for failure to satisfy the conditions of this license) patent
23+
license to make, have made, use, offer to sell, sell, import, and otherwise
24+
transfer this software, where such license applies only to those patent
25+
claims, already acquired or hereafter acquired, licensable by such copyright
26+
holder or contributor that are necessarily infringed by:
27+
28+
(a) their Contribution(s) (the licensed copyrights of copyright holders and
29+
non-copyrightable additions of contributors, in source or binary form)
30+
alone; or
31+
32+
(b) combination of their Contribution(s) with the work of authorship to
33+
which such Contribution(s) was added by such copyright holder or
34+
contributor, if, at the time the Contribution is added, such addition
35+
causes such combination to be necessarily infringed. The patent license
36+
shall not apply to any other combinations which include the
37+
Contribution.
38+
39+
Except as expressly stated above, no rights or licenses from any copyright
40+
holder or contributor is granted under this license, whether expressly, by
41+
implication, estoppel or otherwise.
42+
43+
DISCLAIMER
44+
45+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
46+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
47+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
48+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
49+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
50+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
51+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
52+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
53+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2955
POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)