Skip to content

Commit 845b945

Browse files
mdkinneymdkinney
committed
StdLib: 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 <[email protected]>
1 parent e55c853 commit 845b945

22 files changed

+37
-166
lines changed

‎StdLib/EfiSocketLib/DxeSupport.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
SocketDxe support routines
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/EfiSocketLib/EfiSocketLib.inf

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@
33
#
44
# This module implements the socket layer.
55
# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
6-
#
7-
# All rights reserved. This program and the accompanying materials
8-
# are licensed and made available under the terms and conditions of the BSD License
9-
# which accompanies this distribution. The full text of the license may be found at
10-
# http://opensource.org/licenses/bsd-license.php
11-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
#. All rights reserved.
7+
# SPDX-License-Identifier: BSD-2-Clause-Patent
138
#
149
#**/
1510

‎StdLib/EfiSocketLib/Init.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Implement the constructor and destructor for the EFI socket library
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/EfiSocketLib/Ip4.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Implement the IP4 driver support for the socket layer.
33
44
Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials are licensed and made available
6-
under the terms and conditions of the BSD License which accompanies this
7-
distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
**/
137
#include "Socket.h"
148

‎StdLib/EfiSocketLib/Service.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Connect to and disconnect from the various network layers
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/EfiSocketLib/Socket.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66
* Listen - AcceptWait event is not NULL
77
88
Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
9-
This program and the accompanying materials are licensed and made available under
10-
the terms and conditions of the BSD License that accompanies this distribution.
11-
The full text of the license may be found at
12-
http://opensource.org/licenses/bsd-license.php
13-
14-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
15-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
9+
SPDX-License-Identifier: BSD-2-Clause-Patent
1610
1711
1812
\section DataStructures Data Structures

‎StdLib/EfiSocketLib/Socket.h

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Definitions for the Socket layer driver.
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148
#ifndef _SOCKET_H_

‎StdLib/EfiSocketLib/Tcp4.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Implement the TCP4 driver support for the socket layer.
33
44
Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials are licensed and made available
6-
under the terms and conditions of the BSD License which accompanies this
7-
distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
148
\section ConnectionManagement Connection Management

‎StdLib/EfiSocketLib/Tcp6.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Implement the TCP6 driver support for the socket layer.
33
44
Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials are licensed and made available
6-
under the terms and conditions of the BSD License which accompanies this
7-
distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php.
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
148
\section ConnectionManagement Connection Management

‎StdLib/EfiSocketLib/Udp4.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Implement the UDP4 driver support for the socket layer.
33
4-
Copyright (c) 2011 - 2015, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/EfiSocketLib/Udp6.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Implement the UDP4 driver support for the socket layer.
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/EfiSocketLib/UseEfiSocketLib.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Implement the connection to the EFI socket library
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/SocketDxe/ComponentName.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
UEFI Component Name(2) protocol implementation.
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/SocketDxe/DriverBinding.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Implement the driver binding protocol for the socket layer.
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
148
\section NetworkAdapterManagement Network Adapter Management

‎StdLib/SocketDxe/EntryUnload.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Implement the entry and unload for the socket driver.
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/SocketDxe/Socket.h

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Definitions for the Socket layer driver.
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148
#ifndef _SOCKET_H_

‎StdLib/SocketDxe/SocketDxe.inf

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@
33
#
44
# This module implements the socket layer.
55
# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
6-
#
7-
# All rights reserved. This program and the accompanying materials
8-
# are licensed and made available under the terms and conditions of the BSD License
9-
# which accompanies this distribution. The full text of the license may be found at
10-
# http://opensource.org/licenses/bsd-license.php
11-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
#. All rights reserved.
7+
# SPDX-License-Identifier: BSD-2-Clause-Patent
138
#
149
#**/
1510

‎StdLib/StdLib.dec

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
#
44
# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
55
#
6-
# This program and the accompanying materials are licensed and made available under
7-
# the terms and conditions of the BSD License which accompanies this distribution.
8-
# The full text of the license may be found at
9-
# http://opensource.org/licenses/bsd-license.
10-
#
11-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
# SPDX-License-Identifier: BSD-2-Clause-Patent
137
##
148

159

‎StdLib/StdLib.dsc

+1-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@
1212
# Posix Library.
1313
#
1414
# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
15-
# This program and the accompanying materials
16-
# are licensed and made available under the terms and conditions of the BSD License
17-
# which accompanies this distribution. The full text of the license may be found at
18-
# http://opensource.org/licenses/bsd-license.
19-
#
20-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
21-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
15+
# SPDX-License-Identifier: BSD-2-Clause-Patent
2216
##
2317

2418
[Defines]

‎StdLib/StdLib.inc

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
#
88
# Copyright (c) 2016, Daryl McDaniel. All rights reserved.<BR>
99
# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
10-
# This program and the accompanying materials
11-
# are licensed and made available under the terms and conditions of the BSD License
12-
# which accompanies this distribution. The full text of the license may be found at
13-
# http://opensource.org/licenses/bsd-license.
14-
#
15-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
16-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
10+
# SPDX-License-Identifier: BSD-2-Clause-Patent
1711
################################################################
1812

1913
##########

‎StdLib/UseSocketDxe/UseSocketDxe.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
/** @file
22
Implement the connection to the socket driver
33
4-
Copyright (c) 2011, Intel Corporation
5-
All rights reserved. This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
4+
Copyright (c) 2011, Intel Corporation. All rights reserved.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎StdLib/UseSocketDxe/UseSocketDxe.inf

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@
33
#
44
# This module implements the socket layer.
55
# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
6-
#
7-
# All rights reserved. This program and the accompanying materials
8-
# are licensed and made available under the terms and conditions of the BSD License
9-
# which accompanies this distribution. The full text of the license may be found at
10-
# http://opensource.org/licenses/bsd-license.php
11-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
#. All rights reserved.
7+
# SPDX-License-Identifier: BSD-2-Clause-Patent
138
#
149
#**/
1510

0 commit comments

Comments
 (0)