Skip to content

Commit 9ffa494

Browse files
committed
ShellPkg: 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 fdb6510 commit 9ffa494

File tree

239 files changed

+239
-1650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+239
-1650
lines changed

ShellPkg/Application/Shell/ConsoleLogger.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
(C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
55
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
66
(C) Copyright 2016 Hewlett-Packard Development Company, L.P.<BR>
7-
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-
12-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
7+
SPDX-License-Identifier: BSD-2-Clause-Patent
148
**/
159

1610
#include "Shell.h"

ShellPkg/Application/Shell/ConsoleLogger.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Provides interface to shell console logger.
33
44
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
5-
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.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
**/
137

148
#ifndef _CONSOLE_LOGGER_HEADER_

ShellPkg/Application/Shell/ConsoleWrappers.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
44
(C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
55
Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
6-
This program and the accompanying materials
7-
are licensed and made available under the terms and conditions of the BSD License
8-
which accompanies this distribution. The full text of the license may be found at
9-
http://opensource.org/licenses/bsd-license.php
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

ShellPkg/Application/Shell/ConsoleWrappers.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
44
(C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
55
Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
6-
This program and the accompanying materials
7-
are licensed and made available under the terms and conditions of the BSD License
8-
which accompanies this distribution. The full text of the license may be found at
9-
http://opensource.org/licenses/bsd-license.php
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

ShellPkg/Application/Shell/FileHandleInternal.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
internal worker functions for FileHandleWrappers to use
33
44
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
5-
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.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

ShellPkg/Application/Shell/FileHandleWrappers.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
Copyright 2016 Dell Inc.
66
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
77
(C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
8-
This program and the accompanying materials
9-
are licensed and made available under the terms and conditions of the BSD License
10-
which accompanies this distribution. The full text of the license may be found at
11-
http://opensource.org/licenses/bsd-license.php
12-
13-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
8+
SPDX-License-Identifier: BSD-2-Clause-Patent
159
1610
**/
1711

ShellPkg/Application/Shell/FileHandleWrappers.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
EFI_FILE_PROTOCOL wrappers for other items (Like Environment Variables, StdIn, StdOut, StdErr, etc...)
33
44
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
5-
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.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

ShellPkg/Application/Shell/Shell.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
55
(C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
66
Copyright 2015-2018 Dell Technologies.<BR>
7-
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-
12-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
7+
SPDX-License-Identifier: BSD-2-Clause-Patent
148
159
**/
1610

ShellPkg/Application/Shell/Shell.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
44
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
55
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
6-
This program and the accompanying materials
7-
are licensed and made available under the terms and conditions of the BSD License
8-
which accompanies this distribution. The full text of the license may be found at
9-
http://opensource.org/licenses/bsd-license.php
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

ShellPkg/Application/Shell/Shell.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
# (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
55
# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
66
#
7-
# 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.
7+
# SPDX-License-Identifier: BSD-2-Clause-Patent
138
#
149
#
1510
##

ShellPkg/Application/Shell/Shell.uni

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
//
33
// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
44
// Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved. <BR>
5-
// 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.
5+
// SPDX-License-Identifier: BSD-2-Clause-Patent
126
//
137
// Module Name:
148
//

ShellPkg/Application/Shell/ShellEnvVar.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
function declarations for shell environment functions.
33
44
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
5-
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.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

ShellPkg/Application/Shell/ShellEnvVar.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
88
99
Copyright (c) 2009 - 2018, 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.php
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

ShellPkg/Application/Shell/ShellManParser.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
44
Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
55
Copyright 2015 Dell Inc.
6-
This program and the accompanying materials
7-
are licensed and made available under the terms and conditions of the BSD License
8-
which accompanies this distribution. The full text of the license may be found at
9-
http://opensource.org/licenses/bsd-license.php
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

ShellPkg/Application/Shell/ShellManParser.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Provides interface to shell MAN file parser.
33
44
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
5-
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.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

ShellPkg/Application/Shell/ShellParametersProtocol.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66
Copyright (C) 2014, Red Hat, Inc.
77
(C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>
88
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
9-
This program and the accompanying materials
10-
are licensed and made available under the terms and conditions of the BSD License
11-
which accompanies this distribution. 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

ShellPkg/Application/Shell/ShellParametersProtocol.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
manipulation, and initialization of EFI_SHELL_PARAMETERS_PROTOCOL.
44
55
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
6-
This program and the accompanying materials
7-
are licensed and made available under the terms and conditions of the BSD License
8-
which accompanies this distribution. The full text of the license may be found at
9-
http://opensource.org/licenses/bsd-license.php
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

ShellPkg/Application/Shell/ShellProtocol.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
66
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
77
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
8-
This program and the accompanying materials
9-
are licensed and made available under the terms and conditions of the BSD License
10-
which accompanies this distribution. The full text of the license may be found at
11-
http://opensource.org/licenses/bsd-license.php
12-
13-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
8+
SPDX-License-Identifier: BSD-2-Clause-Patent
159
1610
**/
1711

ShellPkg/Application/Shell/ShellProtocol.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
55
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
66
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
7-
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-
12-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
7+
SPDX-License-Identifier: BSD-2-Clause-Patent
148
159
**/
1610

ShellPkg/Application/ShellCTestApp/ShellCTestApp.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
for a shell application.
44
55
Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
6-
This program and the accompanying materials
7-
are licensed and made available under the terms and conditions of the BSD License
8-
which accompanies this distribution. The full text of the license may be found at
9-
http://opensource.org/licenses/bsd-license.php
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

ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
#
44
# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
55
#
6-
# This program and the accompanying materials
7-
# are licensed and made available under the terms and conditions of the BSD License
8-
# which accompanies this distribution. The full text of the license may be found at
9-
# http://opensource.org/licenses/bsd-license.php
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.
6+
# SPDX-License-Identifier: BSD-2-Clause-Patent
127
#
138
#
149
##

ShellPkg/Application/ShellCTestApp/TestArgv.nsh

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
# This is a very simple shell script to test how the interpreter parses the parameters.
33
#
44
# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
5-
# 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.
5+
# SPDX-License-Identifier: BSD-2-Clause-Patent
126
#
137
#**/
148
echo -on

ShellPkg/Application/ShellExecTestApp/SA.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
This is a simple shell application
33
44
Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
5-
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.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

ShellPkg/Application/ShellExecTestApp/SA.inf

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

ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
This is a test application that demonstrates how to use the sorting functions.
33
44
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
5-
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.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
#
44
# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
55
#
6-
# This program and the accompanying materials
7-
# are licensed and made available under the terms and conditions of the BSD License
8-
# which accompanies this distribution. The full text of the license may be found at
9-
# http://opensource.org/licenses/bsd-license.php
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.
6+
# SPDX-License-Identifier: BSD-2-Clause-Patent
127
#
138
#
149
##

0 commit comments

Comments
 (0)