Skip to content

Commit d096859

Browse files
committed
Change preferred license of EDK II to BSD+Patent
https://bugzilla.tianocore.org/show_bug.cgi?id=1656 Change the EDK II C Coding Standards Specification to state that the preferred license of the EDK II is the BSD+Patent License and that file headers should use SPDX license identifiers. Remove the requirement that there are no blank lines between the copyright statement and the SPDX identifier. This rule is not consistently followed. Cc: Andrew Fish <[email protected]> Cc: Laszlo Ersek <[email protected]> Cc: Leif Lindholm <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <[email protected]> Reviewed-by: Philippe Mathieu-Daude <[email protected]> Reviewed-by: Laszlo Ersek <[email protected]>
1 parent 3f1100b commit d096859

File tree

5 files changed

+11
-47
lines changed

5 files changed

+11
-47
lines changed

5_source_files/52_spacing.md

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -279,15 +279,7 @@ the preferred indentation, but two tabs (four spaces) is also acceptable.
279279
information for a person viewing the file for the first time.
280280
281281
Copyright (C) --20XX, Acme Corporation. All rights reserved.<BR>
282-
This program and the accompanying materials
283-
are licensed and made available under the terms and conditions of
284-
the BSD License which accompanies this distribution. The full
285-
text of the license may be found at
286-
http://opensource.org/licenses/bsd-license.
287-
288-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
289-
BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
290-
EXPRESS OR IMPLIED.
282+
SPDX-License-Identifier: BSD-2-Clause-Patent
291283
292284
@par Revision Reference:
293285
- PI Version 1.0
@@ -364,22 +356,16 @@ the location and content of the file. The correct license will be determined by
364356
the project leader at the time the file is created. In most cases, the license
365357
will be the same as for other files in the module or package.
366358

367-
The majority of the files in EDK II contain the following "BSD" license.
359+
The preferred license for EDK II is the "BSD+Patent" license. The license for
360+
a file is provided in the file header using an SPDX identifier. The following
361+
shows the SPDX identifier for the "BSD+Patent" license.
368362

369363
```
370-
This program and the accompanying materials are licensed and made
371-
available under the terms and conditions of the BSD License that
372-
accompanies this distribution. The full text of the license may be
373-
found at http://opensource.org/licenses/bsd-license.
374-
375-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
376-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
377-
IMPLIED.
364+
SPDX-License-Identifier: BSD-2-Clause-Patent
378365
```
379366

380-
The license will follow the copyright notice without an intervening blank line.
381-
It will be separated from the Specification Reference, if present, by a single
382-
blank line.
367+
The license follows the copyright notice. The license is separated from the
368+
Specification Reference, if present, by a single blank line.
383369

384370
#### 5.2.3.5 Specification Reference
385371

5_source_files/53_include_files.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,7 @@ Not all types of declarations are present in every file.
151151
you should probably also explain your rationale.
152152
153153
Copyright (c) 20XX, Acme Corporation. All rights reserved.<BR>
154-
This program and the accompanying materials
155-
are licensed and made available under the terms and conditions of
156-
the BSD License which accompanies this distribution. The full
157-
text of the license may be found at
158-
http://opensource.org/licenses/bsd-license.
159-
160-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
161-
BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
162-
EXPRESS OR IMPLIED.
154+
SPDX-License-Identifier: BSD-2-Clause-Patent
163155
164156
@par Specification Reference:
165157
- UEFI 2.3, Chapter 9, Device Path Protocol

5_source_files/54_code_file_structure.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,7 @@ these are C files with an extension of "`.c`".
4545
you should probably also explain your rationale.
4646
4747
Copyright (c) 20XX, Acme Corporation. All rights reserved.<BR>
48-
This program and the accompanying materials
49-
are licensed and made available under the terms and conditions of
50-
the BSD License which accompanies this distribution. The full
51-
text of the license may be found at
52-
http://opensource.org/licenses/bsd-license.php
53-
54-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
55-
BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
56-
EXPRESS OR IMPLIED.
48+
SPDX-License-Identifier: BSD-2-Clause-Patent
5749
5850
@par Specification Reference:
5951
- UEFI 2.3, Chapter 9, Device Path Protocol

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved.
112112
| 2.1 | DRAFT for REFORMAT | 10/30/2015 |
113113
| 2.2 | Convert to Gitbook | June 2017 |
114114
| | [#425](https://bugzilla.tianocore.org/show_bug.cgi?id=425) [CCS] clarify line breaking and indentation requirements for multi-line function calls | |
115+
| | [#1656](https://bugzilla.tianocore.org/show_bug.cgi?id=1656) Update all Wiki pages for the BSD+Patent license change with SPDX identifiers | |

appendix_a_common_examples.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,7 @@
4040
Detailed description of file’s purpose.
4141
4242
Copyright (c) 2006 - 2014, Acme Corporation. All rights reserved.<BR>
43-
This program and the accompanying materials
44-
are licensed and made available under the terms and conditions
45-
of the BSD License which accompanies this distribution. The full
46-
text of the license may be found at
47-
http://opensource.org/licenses/bsd-license.php
48-
49-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
50-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
43+
SPDX-License-Identifier: BSD-2-Clause-Patent
5144
5245
@par Specification Reference:
5346
- UEFI 2.3, Chapter 9, Device Path Protocol

0 commit comments

Comments
 (0)